For #20892 update connection panel strings

upstream-sync
Arturo Mejia 3 years ago committed by mergify[bot]
parent 28b07e7c8b
commit d288502840

@ -71,11 +71,11 @@ enum class WebsiteSecurityUiValues(
@DrawableRes val iconRes: Int @DrawableRes val iconRes: Int
) { ) {
SECURE( SECURE(
R.string.quick_settings_sheet_secure_connection, R.string.quick_settings_sheet_secure_connection_2,
R.drawable.ic_lock R.drawable.ic_lock
), ),
INSECURE( INSECURE(
R.string.quick_settings_sheet_insecure_connection, R.string.quick_settings_sheet_insecure_connection_2,
R.drawable.mozac_ic_broken_lock R.drawable.mozac_ic_broken_lock
) )
} }

@ -1716,9 +1716,13 @@
<string name="phone_feature_blocked_step_feature"><![CDATA[3. Toggle <b>%1$s</b> to ON]]></string> <string name="phone_feature_blocked_step_feature"><![CDATA[3. Toggle <b>%1$s</b> to ON]]></string>
<!-- Label that indicates a site is using a secure connection --> <!-- Label that indicates a site is using a secure connection -->
<string name="quick_settings_sheet_secure_connection">Secure Connection</string> <string name="quick_settings_sheet_secure_connection_2">Connection is secure</string>
<!-- Label that indicates a site is using a insecure connection --> <!-- Label that indicates a site is using a insecure connection -->
<string name="quick_settings_sheet_insecure_connection">Insecure Connection</string> <string name="quick_settings_sheet_insecure_connection_2">Connection is not secure</string>
<!-- Label that indicates a site is using a secure connection -->
<string name="quick_settings_sheet_secure_connection" moz:removedIn="94" tools:ignore="UnusedResources">Secure Connection</string>
<!-- Label that indicates a site is using a insecure connection -->
<string name="quick_settings_sheet_insecure_connection" moz:removedIn="94" tools:ignore="UnusedResources">Insecure Connection</string>
<!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites--> <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for all sites-->
<string name="confirm_clear_permissions_on_all_sites">Are you sure that you want to clear all the permissions on all sites?</string> <string name="confirm_clear_permissions_on_all_sites">Are you sure that you want to clear all the permissions on all sites?</string>
<!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site--> <!-- Confirmation message for a dialog confirming if the user wants to delete all the permissions for a site-->

@ -55,7 +55,7 @@ class ConnectionDetailsViewTest {
verify { icons.loadIntoView(binding.faviconImage, IconRequest(websiteUrl)) } verify { icons.loadIntoView(binding.faviconImage, IconRequest(websiteUrl)) }
assertEquals("https://mozilla.org", binding.url.text) assertEquals("https://mozilla.org", binding.url.text)
assertEquals("Secure Connection", binding.securityInfo.text) assertEquals("Connection is secure", binding.securityInfo.text)
} }
@Test @Test
@ -69,7 +69,7 @@ class ConnectionDetailsViewTest {
) )
) )
assertEquals("Insecure Connection", binding.securityInfo.text) assertEquals("Connection is not secure", binding.securityInfo.text)
} }
@Test @Test

@ -52,7 +52,7 @@ class WebsiteInfoViewTest {
verify { icons.loadIntoView(binding.faviconImage, IconRequest(websiteUrl)) } verify { icons.loadIntoView(binding.faviconImage, IconRequest(websiteUrl)) }
assertEquals("mozilla.org", binding.url.text) assertEquals("mozilla.org", binding.url.text)
assertEquals("Secure Connection", binding.securityInfo.text) assertEquals("Connection is secure", binding.securityInfo.text)
} }
@Test @Test
@ -68,6 +68,6 @@ class WebsiteInfoViewTest {
verify { view.bindConnectionDetailsListener() } verify { view.bindConnectionDetailsListener() }
assertEquals("Insecure Connection", binding.securityInfo.text) assertEquals("Connection is not secure", binding.securityInfo.text)
} }
} }

Loading…
Cancel
Save