Skip to content

Commit cd13c29

Browse files
samtsternsamtstern
authored
Translate errors (#1163)
1 parent 299788e commit cd13c29

File tree

90 files changed

+5573
-5480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+5573
-5480
lines changed

‎auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public void onChanged(Resource<String> resource) {
8181
// No FirebaseUser exists with this email address, show error.
8282
mEmailInputLayout.setError(getString(R.string.fui_error_email_does_not_exist));
8383
} else {
84-
mEmailInputLayout.setError(resource.getException().getLocalizedMessage());
84+
// Unknown error
85+
mEmailInputLayout.setError(getString(R.string.fui_error_unknown));
8586
}
8687
}
8788
});

‎auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import android.os.Bundle;
2323
import android.support.annotation.Nullable;
2424
import android.support.annotation.RestrictTo;
25+
import android.support.annotation.StringRes;
2526
import android.support.design.widget.TextInputLayout;
2627
import android.text.Spannable;
2728
import android.text.SpannableStringBuilder;
@@ -137,19 +138,19 @@ private void onSignInOperation(@Nullable Resource<IdpResponse> resource) {
137138
break;
138139
case FAILURE:
139140
getDialogHolder().dismissDialog();
140-
String message = getErrorMessage(resource.getException());
141+
String message = getString(getErrorMessage(resource.getException()));
141142
mPasswordLayout.setError(message);
142143
break;
143144
}
144145
}
145146

146-
private String getErrorMessage(Exception exception) {
147+
@StringRes
148+
private int getErrorMessage(Exception exception) {
147149
if (exception instanceof FirebaseAuthInvalidCredentialsException) {
148-
// TODO: Add translated "wrong password" message
149-
return exception.getLocalizedMessage();
150+
return R.string.fui_error_invalid_password;
150151
}
151152

152-
return exception.getLocalizedMessage();
153+
return R.string.fui_error_unknown;
153154
}
154155

155156
private void onForgotPasswordClicked() {

‎auth/src/main/java/com/firebase/ui/auth/ui/idp/WelcomeBackIdpPrompt.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void onFailure(@NonNull Exception e) {
185185
}
186186

187187
private void finishWithError(Exception e) {
188-
Toast.makeText(this, R.string.fui_general_error, Toast.LENGTH_LONG).show();
188+
Toast.makeText(this, R.string.fui_error_unknown, Toast.LENGTH_LONG).show();
189189
finish(RESULT_CANCELED, IdpResponse.getErrorIntent(e));
190190
}
191191

‎auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneActivity.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import android.os.Handler;
2222
import android.support.annotation.NonNull;
2323
import android.support.annotation.RestrictTo;
24+
import android.support.annotation.StringRes;
2425
import android.support.annotation.VisibleForTesting;
2526
import android.support.v4.app.FragmentTransaction;
2627
import android.support.v7.app.AlertDialog;
@@ -221,18 +222,18 @@ private void onVerificationFailed(@NonNull FirebaseException ex) {
221222
}
222223
break;
223224
case ERROR_TOO_MANY_REQUESTS:
224-
showAlertDialog(getString(R.string.fui_error_too_many_attempts), null);
225+
showAlertDialog(R.string.fui_error_too_many_attempts, null);
225226
break;
226227
case ERROR_QUOTA_EXCEEDED:
227-
showAlertDialog(getString(R.string.fui_error_quota_exceeded), null);
228+
showAlertDialog(R.string.fui_error_quota_exceeded, null);
228229
break;
229230
default:
230231
Log.w(PHONE_VERIFICATION_LOG_TAG, error.getDescription(), ex);
231-
showAlertDialog(error.getDescription(), null);
232+
showAlertDialog(R.string.fui_error_unknown, null);
232233
}
233234
} else {
234-
Log.w(PHONE_VERIFICATION_LOG_TAG, ex.getLocalizedMessage());
235-
showAlertDialog(ex.getLocalizedMessage(), null);
235+
Log.w(PHONE_VERIFICATION_LOG_TAG, "Unknown error", ex);
236+
showAlertDialog(R.string.fui_error_unknown, null);
236237
}
237238
}
238239

@@ -305,8 +306,10 @@ private void finish(FirebaseUser user) {
305306
finish(RESULT_OK, response.toIntent());
306307
}
307308

308-
private void showAlertDialog(@NonNull String s, DialogInterface.OnClickListener
309-
onClickListener) {
309+
private void showAlertDialog(@StringRes int messageId,
310+
DialogInterface.OnClickListener onClickListener) {
311+
312+
String s = getString(messageId);
310313
mAlertDialog = new AlertDialog.Builder(this)
311314
.setMessage(s)
312315
.setPositiveButton(R.string.fui_incorrect_code_dialog_positive_button_text, onClickListener)
@@ -346,7 +349,7 @@ public void onFailure(@NonNull Exception e) {
346349
switch (error) {
347350
case ERROR_INVALID_VERIFICATION_CODE:
348351
showAlertDialog(
349-
getString(R.string.fui_incorrect_code_dialog_body),
352+
R.string.fui_incorrect_code_dialog_body,
350353
new DialogInterface.OnClickListener() {
351354
@Override
352355
public void onClick(DialogInterface dialog, int which) {
@@ -357,7 +360,7 @@ public void onClick(DialogInterface dialog, int which) {
357360
break;
358361
case ERROR_SESSION_EXPIRED:
359362
showAlertDialog(
360-
getString(R.string.fui_error_session_expired),
363+
R.string.fui_error_session_expired,
361364
new DialogInterface.OnClickListener() {
362365
@Override
363366
public void onClick(DialogInterface dialog, int which) {
@@ -368,10 +371,10 @@ public void onClick(DialogInterface dialog, int which) {
368371
break;
369372
default:
370373
Log.w(PHONE_VERIFICATION_LOG_TAG, error.getDescription(), e);
371-
showAlertDialog(error.getDescription(), null);
374+
showAlertDialog(R.string.fui_error_unknown, null);
372375
}
373376
} else {
374-
showAlertDialog(e.getLocalizedMessage(), null);
377+
showAlertDialog(R.string.fui_error_unknown, null);
375378
}
376379
}
377380
});

0 commit comments

Comments
 (0)