Skip to content

Cleanup strings.xml: removed duplicates, Google sign in button now us… #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 10, 2016
Merged

Cleanup strings.xml: removed duplicates, Google sign in button now us… #245

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
c9a2628
Cleanup strings.xml: removed duplicates, Google sign in button now us…
peterhav Aug 9, 2016
9d1ce38
Update strings.xml
peterhav Aug 10, 2016
76aada4
Update idp_button_google.xml
peterhav Aug 10, 2016
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 auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackPasswordPrompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class WelcomeBackPasswordPrompt extends AppCompatBase implements View.OnC
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTitle(R.string.sign_in_title);
setTitle(R.string.sign_in);
setContentView(R.layout.welcome_back_password_prompt_layout);
mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
mIdpResponse = getIntent().getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE);
Expand Down
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/sign_in_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
/>
<Button
style="@style/FirebaseUI.Button"
android:text="@string/button_text_next"
android:text="@string/next"
android:id="@+id/button_done"/>
</LinearLayout>
</RelativeLayout>
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/signin_no_password_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
>
<Button
style="@style/FirebaseUI.Button"
android:text="@string/button_text_next"
android:text="@string/next"
android:id="@+id/button_ok"
/>
</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/welcome_back_idp_prompt_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/welcome_back_idp_button" />
android:text="@string/sign_in" />

</LinearLayout>
2 changes: 1 addition & 1 deletion auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
/>
<Button
style="@style/FirebaseUI.Button"
android:text="@string/button_text_sign_in"
android:text="@string/sign_in"
android:id="@+id/button_done"/>
</LinearLayout>
</LinearLayout>
6 changes: 0 additions & 6 deletions auth/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
<string name="app_name">ui_flow</string>
<string name="email_hint">Email</string>
<string name="sign_in_no_password_title">Put an email to use for sign in</string>
<string name="button_ok_text">OK</string>
<string name="password_hint">Password</string>
<string name="button_singin_text">Sign In</string>
<string name="button_password_recovery_text">Trouble remembering your password</string>
<string name="name_hint">First &amp; last name</string>
<string name="password_recovery_title">Forgot password</string>
Expand All @@ -16,10 +14,8 @@
and numbers</string>
<string name="invalid_email_address">That email address isn\'t correct</string>
<string name="missing_email_address">Enter your email address to continue</string>
<string name="button_text_next">Next</string>
<string name="button_text_send">Send</string>
<string name="button_text_save">Save</string>
<string name="button_text_sign_in">Sign in</string>
<string name="require_email_text">Please input email address</string>
<string name="confirm_recovery_body">Follow the instructions sent to %1$s to recover your
password.</string>
Expand All @@ -31,7 +27,6 @@
<string name="next">Next</string>
<string name="trouble_signing_in">Trouble signing in?</string>
<string name="sign_in">Sign in</string>
<string name="sign_in_title">Sign in</string>
<string name="sign_in_with_google">Sign in with Google</string>
<string name="sign_in_with_facebook">Sign in with Facebook</string>
<string name="button_done">Done</string>
Expand All @@ -42,7 +37,6 @@
You\'ve already used <xliff:g id="email_addr" example="[email protected]">%1$s</xliff:g>.
Sign in with <xliff:g id="provider_name" example="Google">%2$s</xliff:g> to continue.
</string>
<string name="welcome_back_idp_button">Sign in</string>
<string name="welcome_back_password_prompt_body">You\'ve already used
<xliff:g id="email_addr" example="[email protected]">%1$s</xliff:g> to sign in. Enter
your password for that account.</string>
Expand Down