Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/8343, https://github.com/mozilla-mobile/fenix/issues/9709 - replace "phone" with "device" in translations (https://github.com/mozilla-mobile/fenix/pull/14083)

Browse Source
This commit is contained in:
Sören Hentzschel 2020-09-02 19:55:35 +02:00 committed by GitHub
parent c66f2e4188
commit bf51019351
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolder.kt
View File

@ -41,7 +41,7 @@ class OnboardingAutomaticSignInViewHolder(
fun bind(account: ShareableAccount) { fun bind(account: ShareableAccount) {
shareableAccount = account shareableAccount = account
headerText.text = itemView.context.getString( headerText.text = itemView.context.getString(
R.string.onboarding_firefox_account_auto_signin_header_2, account.email R.string.onboarding_firefox_account_auto_signin_header_3, account.email
) )
val icon = getDrawable(itemView.context, R.drawable.ic_onboarding_avatar_anonymous) val icon = getDrawable(itemView.context, R.drawable.ic_onboarding_avatar_anonymous)
headerText.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon) headerText.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon)

2
app/src/main/res/layout/fragment_pwa_onboarding.xml
View File

@ -52,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="16sp" android:textSize="16sp"
android:text="@string/add_to_homescreen_description" android:text="@string/add_to_homescreen_description_2"
app:layout_constraintStart_toEndOf="@id/home_icon" app:layout_constraintStart_toEndOf="@id/home_icon"
app:layout_constraintTop_toTopOf="@id/home_icon" app:layout_constraintTop_toTopOf="@id/home_icon"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />

2
app/src/main/res/layout/onboarding_automatic_signin.xml
View File

@ -19,7 +19,7 @@
android:drawablePadding="12dp" android:drawablePadding="12dp"
android:textAppearance="@style/Header16TextStyle" android:textAppearance="@style/Header16TextStyle"
android:textColor="@color/onboarding_card_primary_text_dark" android:textColor="@color/onboarding_card_primary_text_dark"
tools:text="@string/onboarding_firefox_account_auto_signin_header_2" /> tools:text="@string/onboarding_firefox_account_auto_signin_header_3" />
<Button <Button
android:id="@+id/fxa_sign_in_button" android:id="@+id/fxa_sign_in_button"

8
app/src/main/res/values/strings.xml
View File

@ -1034,7 +1034,7 @@
<!-- text for the firefox account onboarding card header when we detect you're already signed in to <!-- text for the firefox account onboarding card header when we detect you're already signed in to
another Firefox browser. (The word `Firefox` should not be translated) another Firefox browser. (The word `Firefox` should not be translated)
The first parameter is the email of the detected user's account --> The first parameter is the email of the detected user's account -->
<string name="onboarding_firefox_account_auto_signin_header_2">You are signed in as %s on another Firefox browser on this phone. Would you like to sign in with this account?</string> <string name="onboarding_firefox_account_auto_signin_header_3">You are signed in as %s on another Firefox browser on this device. Would you like to sign in with this account?</string>
<!-- text for the button to confirm automatic sign-in --> <!-- text for the button to confirm automatic sign-in -->
<string name="onboarding_firefox_account_auto_signin_confirm">Yes, sign me in</string> <string name="onboarding_firefox_account_auto_signin_confirm">Yes, sign me in</string>
<!-- text for the automatic sign-in button while signing in is in process --> <!-- text for the automatic sign-in button while signing in is in process -->
@ -1274,7 +1274,7 @@
<!-- Placeholder text for the TextView in the Add to Homescreen dialog --> <!-- Placeholder text for the TextView in the Add to Homescreen dialog -->
<string name="add_to_homescreen_text_placeholder">Shortcut name</string> <string name="add_to_homescreen_text_placeholder">Shortcut name</string>
<!-- Describes the add to homescreen functionality --> <!-- Describes the add to homescreen functionality -->
<string name="add_to_homescreen_description">You can easily add this website to your phone’s Home screen to have instant access and browse faster with an app-like experience.</string> <string name="add_to_homescreen_description_2">You can easily add this website to your device’s Home screen to have instant access and browse faster with an app-like experience.</string>
<!-- Preference for managing the settings for logins and passwords in Fenix --> <!-- Preference for managing the settings for logins and passwords in Fenix -->
<string name="preferences_passwords_logins_and_passwords">Logins and passwords</string> <string name="preferences_passwords_logins_and_passwords">Logins and passwords</string>
@ -1533,4 +1533,8 @@
<string name="no_collections_header1">Collect the things that matter to you</string> <string name="no_collections_header1">Collect the things that matter to you</string>
<!-- Deprecated: Label to describe what collections are to a new user without any collections --> <!-- Deprecated: Label to describe what collections are to a new user without any collections -->
<string name="no_collections_description1">Group together similar searches, sites, and tabs for quick access later.</string> <string name="no_collections_description1">Group together similar searches, sites, and tabs for quick access later.</string>
<!-- Deprecated: text for the firefox account onboarding card header when we detect you're already signed in to -->
<string name="onboarding_firefox_account_auto_signin_header_2">You are signed in as %s on another Firefox browser on this phone. Would you like to sign in with this account?</string>
<!-- Deprecated: Describes the add to homescreen functionality -->
<string name="add_to_homescreen_description">You can easily add this website to your phone’s Home screen to have instant access and browse faster with an app-like experience.</string>
</resources> </resources>

2
app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt
View File

@ -62,7 +62,7 @@ class OnboardingAutomaticSignInViewHolderTest {
every { email } returns "email@example.com" every { email } returns "email@example.com"
}) })
assertEquals( assertEquals(
"You are signed in as email@example.com on another Firefox browser on this phone. Would you like to sign in with this account?", "You are signed in as email@example.com on another Firefox browser on this device. Would you like to sign in with this account?",
view.header_text.text view.header_text.text
) )
assertTrue(view.fxa_sign_in_button.isEnabled) assertTrue(view.fxa_sign_in_button.isEnabled)