Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-03 23:15:31 +00:00
Code Issues Releases Wiki Activity

For #18729 - Use consistent string naming for generic strings (#18730)

Browse Source
This commit is contained in:
Gabriel Luong 2021-03-31 18:20:04 -04:00 committed by GitHub
parent 235be0badc
commit 3f21a63c3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
View File

@ -504,8 +504,8 @@ open class DefaultToolbarMenu(
primaryStateIconResource = R.drawable.ic_bookmark_outline,
secondaryStateIconResource = R.drawable.ic_bookmark_filled,
tintColorResource = accentBrightTextColor(),
primaryLabel = context.getString(R.string.add_label),
secondaryLabel = context.getString(R.string.edit_label),
primaryLabel = context.getString(R.string.add),
secondaryLabel = context.getString(R.string.edit),
isInPrimaryState = { !isCurrentUrlBookmarked }
) {
handleBookmarkItemTapped()

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

@ -8,9 +8,9 @@
<!-- A 'Save' string to be used for labeling UI elements. -->
<string name="save">Save</string>
<!-- An 'Add' string to be used for labeling UI elements. -->
<string name="add_label">Add</string>
<!-- A 'Edit' string to be used for labeling UI elements. -->
<string name="edit_label">Edit</string>
<string name="add">Add</string>
<!-- An 'Edit' string to be used for labeling UI elements. -->
<string name="edit">Edit</string>
<!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
<string name="app_name_private_5">Private %s</string>
@ -1644,8 +1644,6 @@
<string name="save_changes_to_login">Save changes to login.</string>
<!-- The button description to discard changes to an edited login. -->
<string name="discard_changes">Discard changes</string>
<!-- The page title for editing a saved login. -->
<string name="edit">Edit</string>
<!-- The error message in edit login view when password field is blank. -->
<string name="saved_login_password_required">Password required</string>
<!-- Voice search button content description -->