Skip to content
This repository has been archived by the owner on Jun 17, 2024. It is now read-only.

Bug 1876610 - Minor Translations UI Adjustments #5305

Merged
merged 3 commits into from
Jan 29, 2024
Merged

Bug 1876610 - Minor Translations UI Adjustments #5305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a147103
Bug 1876610 - Minor Translations UI Adjustments
ohall-m Jan 25, 2024
3bcb724
Merge branch 'main' into bug1876610
mergify[bot] Jan 29, 2024
a3104b4
Merge branch 'main' into bug1876610
mergify[bot] Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
context,
R.drawable.mozac_ic_translate_24,
)!!,
contentDescription = "",
contentDescription = context.getString(R.string.browser_toolbar_translate),
contentDescriptionSelected = "",
visible = {
translationsAvailable || context.settings().enableTranslations
Expand Down
8 changes: 4 additions & 4 deletions ...va/org/mozilla/fenix/translations/preferences/automatic/AutomaticTranslationPreference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,25 @@ internal fun getAutomaticTranslationListPreferences(): List<AutomaticTranslation
return mutableListOf<AutomaticTranslationItemPreference>().apply {
add(
AutomaticTranslationItemPreference(
displayName = Locale.CANADA.displayName,
displayName = Locale.CANADA.displayLanguage,
automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.AlwaysTranslate(),
),
)
add(
AutomaticTranslationItemPreference(
displayName = Locale.FRANCE.displayName,
displayName = Locale.FRANCE.displayLanguage,
automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.OfferToTranslate(),
),
)
add(
AutomaticTranslationItemPreference(
displayName = Locale.GERMANY.displayName,
displayName = Locale.GERMANY.displayLanguage,
automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.NeverTranslate(),
),
)
add(
AutomaticTranslationItemPreference(
displayName = Locale.CHINA.displayName,
displayName = Locale.CHINA.displayLanguage,
automaticTranslationOptionPreference = AutomaticTranslationOptionPreference.AlwaysTranslate(),
),
)
Expand Down
7 changes: 1 addition & 6 deletions ...mozilla/fenix/translations/preferences/nevertranslatesite/NeverTranslateSitePreference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,7 @@ internal fun getNeverTranslateListItemsPreference(): List<NeverTranslateSiteList
return mutableListOf<NeverTranslateSiteListItemPreference>().apply {
add(
NeverTranslateSiteListItemPreference(
websiteUrl = "expedia.ca",
),
)
add(
NeverTranslateSiteListItemPreference(
websiteUrl = "wikipedia.com",
websiteUrl = "mozilla.org",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this just a tmp list?

Copy link
Contributor Author

@ohall-m ohall-m Jan 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, wanting to open up for L10N review and thought we shouldn't have unaffiliated references.

),
)
}
Expand Down
4 changes: 4 additions & 0 deletions fenix/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,16 @@
<string name="browser_menu_edit">Edit</string>
<!-- Button shown on the home page that opens the Customize home settings -->
<string name="browser_menu_customize_home_1">Customize homepage</string>

<!-- Browser Toolbar -->
<!-- Content description for the Home screen button on the browser toolbar -->
<string name="browser_toolbar_home">Home screen</string>
<!-- Content description (not visible, for screen readers etc.): Erase button: Erase the browsing
history and go back to the home screen. -->
<string name="browser_toolbar_erase">Erase browsing history</string>
<!-- Content description for the translate page toolbar button that opens the translations dialog when no translation has occurred. -->
<string name="browser_toolbar_translate">Translate page</string>

<!-- Locale Settings Fragment -->
<!-- Content description for tick mark on selected language -->
<string name="a11y_selected_locale_content_description">Selected language</string>
Expand Down
Loading