jenkins-bot has submitted this change and it was merged. Change subject: Login and create account string/icon changes ......................................................................
Login and create account string/icon changes Added a few new strings so they can get translated sooner. The link text from create account is not used yet because I don't want to cause a big stack of activities with login > create account > login > ... Change-Id: I4ebec0effaaf9909e3e042288a418739f76de67d --- M wikipedia/res/menu/menu_create_account.xml M wikipedia/res/menu/menu_login.xml M wikipedia/res/values-qq/strings.xml M wikipedia/res/values/strings.xml 4 files changed, 12 insertions(+), 7 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/menu/menu_create_account.xml b/wikipedia/res/menu/menu_create_account.xml index a687290..00cc89d 100644 --- a/wikipedia/res/menu/menu_create_account.xml +++ b/wikipedia/res/menu/menu_create_account.xml @@ -3,8 +3,8 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto";> <item android:id="@+id/menu_create_account" - android:icon="@android:drawable/ic_menu_send" + android:icon="@drawable/ic_save" android:enabled="false" android:title="@string/menu_create_account" - app:showAsAction="always" /> + app:showAsAction="always|withText" /> </menu> \ No newline at end of file diff --git a/wikipedia/res/menu/menu_login.xml b/wikipedia/res/menu/menu_login.xml index b21b2c3..bbbfb9e 100644 --- a/wikipedia/res/menu/menu_login.xml +++ b/wikipedia/res/menu/menu_login.xml @@ -3,9 +3,8 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto";> <item android:id="@+id/menu_login" - android:icon="@android:drawable/ic_menu_send" + android:icon="@drawable/ic_save" android:title="@string/menu_login" android:enabled="false" - app:showAsAction="always" - /> + app:showAsAction="always|withText"/> </menu> \ No newline at end of file diff --git a/wikipedia/res/values-qq/strings.xml b/wikipedia/res/values-qq/strings.xml index 0f51b8e..422f853 100644 --- a/wikipedia/res/values-qq/strings.xml +++ b/wikipedia/res/values-qq/strings.xml @@ -86,10 +86,13 @@ <string name="create_account_username_hint">{{Identical|Username}}</string> <string name="create_account_password_hint">{{Identical|Password}}</string> <string name="menu_create_account">{{Identical|Create account}}</string> - <string name="login_create_account_link">{{Identical|Create account}}</string> + <string name="login_create_account_link">Link text on Login screen to go to Create Account screen</string> + <string name="create_account_login_link">Link text on Create Account screen to go to Login screen</string> <string name="create_account_activity_title">{{Identical|Create account}}</string> <string name="create_account_passwords_mismatch_error">{{Identical|Passwords do not match}}</string> <string name="create_account_no_network">Message shown when the network is unavailable during account creation</string> + <string name="create_account_next">Button text on Create Account screen to go "next" (to CAPTCHA)</string> + <string name="create_account_button">Button text on Create Account screen to go start creating the account (may also go to a CAPTCHA screen first)</string> <string name="preferences_general_heading">Preferences general heading</string> <string name="zero_charged_verbiage">Text for toast connoting that Wikipedia Zero status went to OFF</string> <string name="zero_charged_verbiage_extended">Extended text describing that further usage of the app may in fact incur data charges because Wikipedia Zero is off.</string> diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index 0b07158..4694201 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -88,7 +88,8 @@ <string name="create_account_username_hint">Username</string> <string name="create_account_password_hint">Password</string> <string name="menu_create_account">Create account</string> - <string name="login_create_account_link">Create account</string> + <string name="login_create_account_link">Don\'t have an account? Join Wikipedia</string> + <string name="create_account_login_link">Already have an account? Log in</string> <string name="create_account_activity_title">Create an account</string> <string name="edit_section_activity_title">Edit Section</string> <string name="dialog_create_account_checking_progress">Verifying</string> @@ -101,6 +102,8 @@ <string name="create_account_open_proxy_error">This IP address has been blocked from creating accounts.</string> <string name="create_account_generic_error">Could not create account</string> <string name="create_account_no_network">No network connection</string> + <string name="create_account_next">Next</string> + <string name="create_account_button">Create Account</string> <string name="preferences_general_heading">General</string> <string name="zero_charged_verbiage">Wikipedia Zero is off</string> <string name="zero_charged_verbiage_extended">Loading other articles may incur data charges.</string> -- To view, visit https://gerrit.wikimedia.org/r/140937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ebec0effaaf9909e3e042288a418739f76de67d Gerrit-PatchSet: 7 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Dbrant <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
