Skip to content

Conversation

@SUPERCILEX
Copy link
Collaborator

The original purpose of this PR was to fix this still saying "Sign in", but the strings.xml file drove me crazy so I did a ton of cleanup there.

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
<string name="name_hint">First &amp; last name</string>
<string name="password_recovery_body">Get instructions sent to this email that explain how to
reset your password.</string>
<string name="create_account_title">Create account</string>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I changed this to "Sign up" to be more consistent with our progress dialog.

</plurals>
<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="error_weak_password">Password not strong enough. Use at least 6 characters and a mix of letters and numbers.</string>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Got rid of this; using the plural instead.

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
<string name="title_check_email">@string/sign_in_default</string>
<string name="title_register_email_activity">@string/create_account_title</string>
<string name="title_recover_password_activity">@string/recover_password_title</string>
<string name="title_confirm_recover_password_activity">@string/check_your_email</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

While these title_ strings are not part of the public API, I know there are some devs that do override them. We seem to have changed title_confirm_recover_password_activity to title_confirm_recover_password here, can we undo that just to keep the resource name as long as we can? Or is there a reason for the change?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I meant to change it to title_confirm_recover_password_dialog because it's used in the dialog:

return new AlertDialog.Builder(getContext(), R.style.FirebaseUI_Dialog)
                .setTitle(R.string.title_confirm_recover_password)

@samtstern Would you like me to change it back to title_confirm_recover_password_activity or to title_confirm_recover_password_dialog?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah if was never used as an Activity title it's fine as-is.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It was an activity in the dark ages before #357 (comment). I just never changed the string name...

…p-strings

# Conflicts:
#	auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
#	auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
#	auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
#	auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/PasswordFieldValidator.java
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
@samtstern samtstern merged commit 48e138f into firebase:version-1.1.0-dev Jan 3, 2017
@SUPERCILEX SUPERCILEX deleted the cleanup-strings branch January 3, 2017 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants