For #22189 - Replace app name with 'Firefox' for Sync strings
This commit is contained in:
parent
7ca7190199
commit
c1431c5c12
|
@ -443,7 +443,7 @@ private fun assertWelcomeHeader() =
|
|||
|
||||
private fun assertStartSyncHeader() {
|
||||
scrollToElementByText(STRING_ONBOARDING_ACCOUNT_SIGN_IN_HEADER)
|
||||
onView(allOf(withText("Sync $appName between devices")))
|
||||
onView(allOf(withText(R.string.onboarding_account_sign_in_header_1)))
|
||||
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||
}
|
||||
private fun assertAccountsSignInButton() =
|
||||
|
|
|
@ -29,7 +29,7 @@ class OnboardingManualSignInViewHolder(view: View) : RecyclerView.ViewHolder(vie
|
|||
val context = itemView.context
|
||||
val appName = context.getString(R.string.app_name)
|
||||
binding.headerText.text =
|
||||
context.getString(R.string.onboarding_account_sign_in_header_2, appName)
|
||||
context.getString(R.string.onboarding_account_sign_in_header_1)
|
||||
binding.descriptionText.text =
|
||||
context.getString(R.string.onboarding_manual_sign_in_description_2, appName)
|
||||
}
|
||||
|
|
|
@ -372,10 +372,7 @@ private fun SyncedTabsErrorPreview() {
|
|||
FirefoxTheme {
|
||||
Box(Modifier.background(FirefoxTheme.colors.layer1)) {
|
||||
SyncedTabsErrorItem(
|
||||
errorText = stringResource(
|
||||
R.string.synced_tabs_no_tabs_2,
|
||||
stringResource(R.string.app_name)
|
||||
),
|
||||
errorText = stringResource(R.string.synced_tabs_no_tabs),
|
||||
errorButton = SyncedTabsListItem.ErrorButton(
|
||||
buttonText = stringResource(R.string.synced_tabs_sign_in_button)
|
||||
) {
|
||||
|
|
|
@ -116,10 +116,7 @@ class SyncedTabsIntegration(
|
|||
|
||||
SyncedTabsView.ErrorType.NO_TABS_AVAILABLE ->
|
||||
SyncedTabsListItem.Error(
|
||||
errorText = context.getString(
|
||||
R.string.synced_tabs_no_tabs_2,
|
||||
context.getString(R.string.app_name)
|
||||
),
|
||||
errorText = context.getString(R.string.synced_tabs_no_tabs),
|
||||
)
|
||||
|
||||
SyncedTabsView.ErrorType.SYNC_UNAVAILABLE ->
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
app:layout_constraintStart_toStartOf="@id/avatar_icon"
|
||||
app:layout_constraintBottom_toBottomOf="@id/avatar_icon"
|
||||
android:layout_marginStart="52dp"
|
||||
tools:text="@string/onboarding_account_sign_in_header_2" />
|
||||
tools:text="@string/onboarding_account_sign_in_header_1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/description_text"
|
||||
|
|
|
@ -1127,10 +1127,9 @@
|
|||
The first parameter is the name of the app (e.g. Firefox Preview) -->
|
||||
<string name="onboarding_header">Welcome to %s!</string>
|
||||
<!-- text for the Firefox account onboarding sign in card header. The word "Firefox" should not be translated -->
|
||||
<string name="onboarding_account_sign_in_header_1" moz:RemovedIn="99" tools:ignore="UnusedResources">Sync Firefox between devices</string>
|
||||
<string name="onboarding_account_sign_in_header_1">Sync Firefox between devices</string>
|
||||
<!-- text for the Firefox account onboarding sign in card header. The first parameter is the name of the application.-->
|
||||
<string name="onboarding_account_sign_in_header_2">Sync %1$s between devices</string>
|
||||
<!-- Text for the button to learn more about signing in to your Firefox account -->
|
||||
<string name="onboarding_account_sign_in_header_2" moz:RemovedIn="100" tools:ignore="UnusedResources">Sync %1$s between devices</string>
|
||||
<!-- Text for the button to learn more about signing in to your Firefox account. The first parameter is the name of the application.-->
|
||||
<string name="onboarding_manual_sign_in_description_2">Bring bookmarks, history, and passwords to %1$s on this device.</string>
|
||||
<!-- text for the button to manually sign into Firefox account. -->
|
||||
|
@ -1636,9 +1635,9 @@
|
|||
<!-- Text displayed when user has disabled tab syncing in Firefox Sync Account -->
|
||||
<string name="synced_tabs_enable_tab_syncing">Please enable tab syncing.</string>
|
||||
<!-- Text displayed when user has no tabs that have been synced -->
|
||||
<string name="synced_tabs_no_tabs" moz:removedIn="99" tools:ignore="UnusedResources">You don’t have any tabs open in Firefox on your other devices.</string>
|
||||
<string name="synced_tabs_no_tabs">You don’t have any tabs open in Firefox on your other devices.</string>
|
||||
<!-- Text displayed when user has no tabs that have been synced. The first parameter is the name of the application.-->
|
||||
<string name="synced_tabs_no_tabs_2">You don’t have any tabs open in %1$s on your other devices.</string>
|
||||
<string name="synced_tabs_no_tabs_2" moz:RemovedIn="100" tools:ignore="UnusedResources">You don’t have any tabs open in %1$s on your other devices.</string>
|
||||
<!-- Text displayed in the synced tabs screen when a user is not signed in to Firefox Sync describing Synced Tabs -->
|
||||
<string name="synced_tabs_sign_in_message">View a list of tabs from your other devices.</string>
|
||||
<!-- Text displayed on a button in the synced tabs screen to link users to sign in when a user is not signed in to Firefox Sync -->
|
||||
|
|
|
@ -51,8 +51,7 @@ class OnboardingManualSignInViewHolderTest {
|
|||
@Test
|
||||
fun `bind header text`() {
|
||||
OnboardingManualSignInViewHolder(binding.root).bind()
|
||||
val appName = testContext.getString(R.string.app_name)
|
||||
val string = testContext.getString(R.string.onboarding_account_sign_in_header_2, appName)
|
||||
val string = testContext.getString(R.string.onboarding_account_sign_in_header_1)
|
||||
assertEquals(
|
||||
string,
|
||||
binding.headerText.text
|
||||
|
|
Loading…
Reference in New Issue
Block a user