MetuFSS
/
metu.life-android
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify the error messages and remove unused strings.

Browse Source
main
Vavassor 8 years ago
parent f662327577
commit a9970ee875
7 changed files with 66 additions and 121 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 32
      app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
  2. 2
      app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
  3. 2
      app/src/main/java/com/keylesspalace/tusky/ReportActivity.java
  4. 2
      app/src/main/java/com/keylesspalace/tusky/ViewThreadFragment.java
  5. 45
      app/src/main/res/values-de/strings.xml
  6. 52
      app/src/main/res/values-fr/strings.xml
  7. 52
      app/src/main/res/values/strings.xml

32
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
Unescape View File

@ -246,7 +246,7 @@ public class AccountActivity extends BaseActivity {
}
private void onObtainAccountFailure() {
Snackbar.make(tabLayout, R.string.error_obtain_account, Snackbar.LENGTH_LONG)
Snackbar.make(tabLayout, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -377,19 +377,14 @@ public class AccountActivity extends BaseActivity {
}
private void onFollowFailure(final String id) {
int messageId;
if (following) {
messageId = R.string.error_unfollowing;
} else {
messageId = R.string.error_following;
}
View.OnClickListener listener = new View.OnClickListener() {
@Override
public void onClick(View v) {
follow(id);
}
};
Snackbar.make(findViewById(R.id.activity_account), messageId, Snackbar.LENGTH_LONG)
View anyView = findViewById(R.id.activity_account);
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, listener)
.show();
}
@ -419,19 +414,14 @@ public class AccountActivity extends BaseActivity {
}
private void onBlockFailure(final String id) {
int messageId;
if (blocking) {
messageId = R.string.error_unblocking;
} else {
messageId = R.string.error_blocking;
}
View.OnClickListener listener = new View.OnClickListener() {
@Override
public void onClick(View v) {
block(id);
}
};
Snackbar.make(findViewById(R.id.activity_account), messageId, Snackbar.LENGTH_LONG)
View anyView = findViewById(R.id.activity_account);
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, listener)
.show();
}
@ -463,22 +453,14 @@ public class AccountActivity extends BaseActivity {
}
private void onMuteFailure(final String id) {
int messageId;
if (muting) {
messageId = R.string.error_unmuting;
} else {
messageId = R.string.error_muting;
}
View.OnClickListener listener = new View.OnClickListener() {
@Override
public void onClick(View v) {
mute(id);
}
};
Snackbar.make(findViewById(R.id.activity_account), messageId, Snackbar.LENGTH_LONG)
View anyView = findViewById(R.id.activity_account);
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, listener)
.show();
}

2
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
Unescape View File

@ -790,7 +790,7 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFrag
}
private void onSendFailure() {
textEditor.setError(getString(R.string.error_sending_status));
textEditor.setError(getString(R.string.error_generic));
statusAlreadyInFlight = false;
}

2
app/src/main/java/com/keylesspalace/tusky/ReportActivity.java
Unescape View File

@ -139,7 +139,7 @@ public class ReportActivity extends BaseActivity {
private void onSendFailure(final String accountId, final String[] statusIds,
final String comment) {
Snackbar.make(anyView, R.string.error_report_unsent, Snackbar.LENGTH_LONG)
Snackbar.make(anyView, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, new View.OnClickListener() {
@Override
public void onClick(View v) {

2
app/src/main/java/com/keylesspalace/tusky/ViewThreadFragment.java
Unescape View File

@ -129,7 +129,7 @@ public class ViewThreadFragment extends SFragment implements StatusActionListene
private void onThreadRequestFailure(final String id) {
View view = getView();
if (view != null) {
Snackbar.make(view, R.string.error_view_thread, Snackbar.LENGTH_LONG)
Snackbar.make(view, R.string.error_generic, Snackbar.LENGTH_LONG)
.setAction(R.string.action_retry, new View.OnClickListener() {
@Override
public void onClick(View v) {

45
app/src/main/res/values-de/strings.xml
Unescape View File

@ -1,21 +1,14 @@
<resources>
<string name="error_invalid_domain">Ungültige Domain angegeben</string>
<string name="error_failed_app_registration">Diese App konnte sich auf dem Server nicht authentifizieren.</string>
<string name="error_authorization_unknown">Ein undefinierbarer Autorisierungsfehler ist aufgetreten.</string>
<string name="error_fetching_notifications">Benachrichtigungen konnten nicht empfangen werden.</string>
<string name="error_compose_character_limit">Der Status ist zu lang!</string>
<string name="error_sending_status">Der Status konnte nicht gesendet werden.</string>
<string name="error_media_upload_size">Die Datei muss kleiner als 4MB sein.</string>
<string name="error_media_upload_type">Dieser Dateityp darf nicht hochgeladen werden.</string>
<string name="error_media_upload_opening">Die Datei konnte nicht geöffnet werden.</string>
<string name="error_media_upload_permission">Eine Leseberechtigung wird für das Hochladen der Mediendatei benötigt.</string>
<string name="error_media_upload_image_or_video">Bilder und Videos können beide nicht an den Status angehängt werden.</string>
<string name="error_media_upload_sending">Die Mediendatei konnte nicht hochgeladen werden.</string>
<string name="error_following">Dem Benutzer wurde nicht gefolgt.</string>
<string name="error_unfollowing">Dieser Benutzer wurde nicht entfolgt.</string>
<string name="error_blocking">Dieser Benutzer wurde nicht blockiert.</string>
<string name="error_unblocking">Dieser Benutzer wurde nicht entblockt.</string>
<string name="error_view_thread">Konnte diese Unterhaltung nicht empfangen.</string>
<string name="error_obtain_account">Fehler beim Laden des Accounts.</string>
<string name="error_report_unsent">Dieser Bericht konnte nicht gesendet werden.</string>
<string name="error_report_too_few_statuses">Mindestens ein Status muss berichtet werden.</string>
<string name="title_home">Start</string>
@ -35,9 +28,6 @@
<string name="status_content_warning_show_more">Zeige mehr</string>
<string name="status_content_warning_show_less">Zeige weniger</string>
<string name="footer_retry_statuses">Konnte den Rest der Status nicht laden.</string>
<string name="footer_retry_notifications">Konnte den Rest der Benachrichtigungen nicht laden.</string>
<string name="footer_retry_accounts">Konnte den Rest der Accounts nicht laden.</string>
<string name="footer_end_of_statuses">Ende der Status</string>
<string name="footer_end_of_notifications">Ende der Benachrichtigungen</string>
<string name="footer_end_of_accounts">Ende der Accounts</string>
@ -72,7 +62,17 @@
<string name="action_view_favourites">Favoriten</string>
<string name="action_view_blocks">Blockierte Nutzer</string>
<string name="action_open_in_web">Im Browser öffnen</string>
<string name="action_set_time">Setzen</string>
<string name="action_submit">Senden</string>
<string name="action_photo_pick">Füge Medien hinzu</string>
<string name="action_share">Teilen</string>
<string name="action_mute">Stummschalten</string>
<string name="action_unmute">Lautschalten</string>
<string name="action_mention">Erwähnen</string>
<string name="toggle_nsfw">NSFW</string>
<string name="send_status_to">Teile Toot-URL zu…</string>
<string name="search">Suche Accounts…</string>
<string name="confirmation_send">Toot!</string>
<string name="confirmation_reported">Gesendet!</string>
@ -97,30 +97,17 @@
<string name="visibility_private">Nur für Follower und Erwähnte sichtbar</string>
<string name="pref_title_notification_settings">Benachrichtigungen</string>
<string name="pref_title_notifications_enabled">Push-Benachrichtigungen</string>
<string name="pref_title_notification_alert_sound">Benachrichtige mit Sound</string>
<string name="pref_title_notification_alert_vibrate">Benachrichtige mit Vibration</string>
<string name="pref_title_notification_alert_light">Benachrichtige mit Licht</string>
<string name="pref_title_appearance_settings">Aussehen</string>
<string name="pref_title_light_theme">Benutze helles Theme</string>
<string name="action_submit">Senden</string>
<string name="action_photo_pick">Füge Medien hinzu</string>
<string name="action_compose_options">Privatsphären-Optionen</string>
<string name="login_success">Willkommen zurück!</string>
<string name="action_share">Teilen</string>
<string name="send_status_to">Teile Toot-URL zu…</string>
<string name="action_mute">Stummschalten</string>
<string name="action_unmute">Lautschalten</string>
<string name="error_unmuting">Dieser Benutzer wurde nicht lautgeschaltet.</string>
<string name="error_muting">Dieser Benutzer wurde nicht stummgeschaltet.</string>
<string name="search">Suche Accounts…</string>
<string name="toggle_nsfw">NSFW</string>
<string name="action_mention">Erwähnen</string>
<string name="notification_mention_format">%s hat dich erwähnt</string>
<string name="error_invalid_domain">Ungültige Domain angegeben</string>
<string name="error_failed_app_registration">Diese App konnte sich auf dem Server nicht authentifizieren.</string>
<string name="notification_summary_large">%1$s, %2$s, %3$s und %4$d andere</string>
<string name="notification_summary_medium">%1$s, %2$s, und %3$s</string>
<string name="notification_summary_small">%1$s und %2$s</string>
<string name="notification_title_summary">%d neue Interaktionen</string>
<string name="pref_title_notifications_enabled">Push-Benachrichtigungen</string>
</resources>

52
app/src/main/res/values-fr/strings.xml
Unescape View File

@ -1,25 +1,19 @@
<resources>
<string name="error_generic">Une erreur s\'est produite.</string>
<string name="error_invalid_domain">Le domaine est invalide</string>
<string name="error_failed_app_registration">L\'application n\'a pu s\'authentifier avec l\'instance.</string>
<string name="error_no_web_browser_found">Impossible de trouver un navigateur web.</string>
<string name="error_authorization_unknown">Une erreur d'authorisation inconnu s'est produite.</string>
<string name="error_authorization_unknown">Une erreur d\'authorisation inconnu s\'est produite.</string>
<string name="error_authorization_denied">Vous ne pouvez pas vous authentifier.</string>
<string name="error_retrieving_oauth_token">Impossible de récupérer le jeton d\'authentification.</string>
<string name="error_fetching_notifications">Impossible d\'actualiser les notifications.</string>
<string name="error_compose_character_limit">Votre pouet est trop long!</string>
<string name="error_sending_status">Impossible d\'envoyer le pouet.</string>
<string name="error_media_upload_size">Le fichier doit faire moins de 4Mo.</string>
<string name="error_media_upload_type">Ce type de fichier n\'est pas accepté.</string>
<string name="error_media_upload_opening">Le fichier ne peut être ouvert.</string>
<string name="error_media_upload_permission">Permission to read media is required to upload it.</string>
<string name="error_media_upload_image_or_video">Impossible de mettre une vidéo et une image sur le même pouet.</string>
<string name="error_media_upload_sending">Ce média ne peut être uploadé.</string>
<string name="error_following">Vous n\'avez pas suivit cet utilisateur.</string>
<string name="error_unfollowing">Vous suivez toujours cet utilisateur.</string>
<string name="error_blocking">Vous n\'avez pas bloqué cet utilisateur.</string>
<string name="error_unblocking">Cet utilisateur est toujours bloqué.</string>
<string name="error_view_thread">Impossible de voir ce pouet.</string>
<string name="error_obtain_account">Impossible de voir ce compte.</string>
<string name="error_report_unsent">Le signalement n\'a pas été envoyé.</string>
<string name="error_report_too_few_statuses">Au moins un pouet a été reporté.</string>
<string name="title_home">Accueil</string>
@ -41,9 +35,6 @@
<string name="status_content_warning_show_more">Voir plus</string>
<string name="status_content_warning_show_less">Voir moins</string>
<string name="footer_retry_statuses">Impossible de charger le reste de ce pouet.</string>
<string name="footer_retry_notifications">Impossible d\'afficher plus de notification.</string>
<string name="footer_retry_accounts">Impossible de charger plus de comptes.</string>
<string name="footer_end_of_statuses">fin du pouet</string>
<string name="footer_end_of_notifications">fin des notifications</string>
<string name="footer_end_of_accounts">fin des comptes</string>
@ -78,7 +69,17 @@
<string name="action_view_favourites">Favoris</string>
<string name="action_view_blocks">Utilisateurs bloqués</string>
<string name="action_open_in_web">Ouvrir avec votre navigateur</string>
<string name="action_set_time">Définir</string>
<string name="action_submit">Envoyer</string>
<string name="action_photo_pick">Ajouter un média</string>
<string name="action_share">Partager</string>
<string name="action_mute">Rendre muet</string>
<string name="action_unmute">Redonner la parole</string>
<string name="action_mention">Mention</string>
<string name="toggle_nsfw">NSFW</string>
<string name="send_status_to">Partager l\'URL de votre pouet avec…</string>
<string name="search">Rechercher un compte…</string>
<string name="confirmation_send">Toot!</string>
<string name="confirmation_reported">Envoyer!</string>
@ -87,9 +88,9 @@
<string name="hint_compose">Quoi de neuf ?</string>
<string name="hint_content_warning">Contenu mis en garde</string>
<string name="link_whats_an_instance">Qu'est ce qu\'une instance?</string>
<string name="link_whats_an_instance">Qu\'est ce qu\'une instance?</string>
<string name="dialog_whats_an_instance">L'adresse ou le domaine d'une instance peut être entré
<string name="dialog_whats_an_instance">L\'adresse ou le domaine d\'une instance peut être entré
Ici, comme mastodon.social, icosahedron.website, social.tchncs.de, et
<a href="https://github.com/tootsuite/mastodon/blob/master/docs/Using-Mastodon/List-of-Mastodon-instances.md">plus (en anglais)!</a>
\n\nSi vous n\'avez pas de compte, Vous pouvez entrer le nom de l\'instance que vous voulez rejoindre et créer un compte ici.\n\n Une instance est l\'endroit où votre compte est
@ -104,6 +105,7 @@
<string name="visibility_private">Uniquement les followers et les mentionnés peuvent voir</string>
<string name="pref_title_notification_settings">Notifications</string>
<string name="pref_title_notifications_enabled">Notifications push</string>
<string name="pref_title_notification_alerts">Alertes</string>
<string name="pref_title_notification_alert_sound">Sonner pour notifier</string>
<string name="pref_title_notification_alert_vibrate">Vibrer pour notifier</string>
@ -115,25 +117,11 @@
<string name="pref_title_notification_filter_favourites">mes pouets mis en favoris</string>
<string name="pref_title_appearance_settings">Apparence</string>
<string name="pref_title_light_theme">Utiliser le thème clair</string>
<string name="action_submit">Envoyer</string>
<string name="action_photo_pick">Ajouter un média</string>
<string name="action_compose_options">Vie privée</string>
<string name="login_success">Content de vous revoir!</string>
<string name="action_share">Partager</string>
<string name="send_status_to">Partager l\'URL de votre pouet avec…</string>
<string name="action_mute">Rendre muet</string>
<string name="action_unmute">Redonner la parole</string>
<string name="error_unmuting">L\'utilisateur est toujours muet.</string>
<string name="error_muting">L\'utilisateur n\'est pas devenu muet.</string>
<string name="search">Rechercher un compte…</string>
<string name="toggle_nsfw">NSFW</string>
<string name="action_mention">Mention</string>
<string name="notification_mention_format">%s vous ont mentionnés</string>
<string name="error_invalid_domain">Le domaine est invalide</string>
<string name="error_failed_app_registration">L\'application n'a pu s'authentifier avec l\'instance.</string>
<string name="notification_summary_large">%1$s, %2$s, %3$s et %4$d plus</string>
<string name="notification_summary_medium">%1$s, %2$s, et %3$s</string>
<string name="notification_summary_small">%1$s et %2$s</string>
<string name="notification_title_summary">%d nouvelles interactions</string>
<string name="pref_title_notifications_enabled">Notifications push</string>
</resources>

52
app/src/main/res/values/strings.xml
Unescape View File

@ -1,25 +1,19 @@
<resources>
<string name="error_generic">An error occurred.</string>
<string name="error_invalid_domain">Invalid domain entered</string>
<string name="error_failed_app_registration">Failed authenticating with that instance.</string>
<string name="error_no_web_browser_found">Couldn\'t find a web browser to use.</string>
<string name="error_authorization_unknown">An unidentified authorization error occurred.</string>
<string name="error_authorization_denied">Authorization was denied.</string>
<string name="error_retrieving_oauth_token">Failed getting a login token.</string>
<string name="error_fetching_notifications">Notifications could not be fetched.</string>
<string name="error_compose_character_limit">The status is too long!</string>
<string name="error_sending_status">The status failed to be sent.</string>
<string name="error_media_upload_size">The file must be less than 4MB.</string>
<string name="error_media_upload_type">That type of file is not able to be uploaded.</string>
<string name="error_media_upload_type">That type of file cannot be uploaded.</string>
<string name="error_media_upload_opening">That file could not be opened.</string>
<string name="error_media_upload_permission">Permission to read media is required to upload it.</string>
<string name="error_media_upload_permission">Permission to read media is required.</string>
<string name="error_media_upload_image_or_video">Images and videos cannot both be attached to the same status.</string>
<string name="error_media_upload_sending">The media could not be uploaded.</string>
<string name="error_following">That user wasn\'t followed.</string>
<string name="error_unfollowing">That user wasn\'t unfollowed.</string>
<string name="error_blocking">That user wasn\'t blocked.</string>
<string name="error_unblocking">That user wasn\'t unblocked.</string>
<string name="error_view_thread">Couldn\'t fetch that thread.</string>
<string name="error_obtain_account">Failed to obtain that account.</string>
<string name="error_report_unsent">The report could not be sent.</string>
<string name="error_media_upload_sending">The upload failed.</string>
<string name="error_report_too_few_statuses">At least one status must be reported.</string>
<string name="title_home">Home</string>
@ -41,9 +35,6 @@
<string name="status_content_warning_show_more">Show More</string>
<string name="status_content_warning_show_less">Show Less</string>
<string name="footer_retry_statuses">Could not load the rest of the statuses.</string>
<string name="footer_retry_notifications">Could not load the rest of the statuses.</string>
<string name="footer_retry_accounts">Could not load the rest of the accounts.</string>
<string name="footer_end_of_statuses">end of the statuses</string>
<string name="footer_end_of_notifications">end of the notifications</string>
<string name="footer_end_of_accounts">end of the accounts</string>
@ -78,7 +69,17 @@
<string name="action_view_favourites">Favourites</string>
<string name="action_view_blocks">Blocked users</string>
<string name="action_open_in_web">Open in browser</string>
<string name="action_set_time">Set</string>
<string name="action_submit">Submit</string>
<string name="action_photo_pick">Add media</string>
<string name="action_share">Share</string>
<string name="action_mute">Mute</string>
<string name="action_unmute">Unmute</string>
<string name="action_mention">Mention</string>
<string name="toggle_nsfw">NSFW</string>
<string name="send_status_to">Share toot URL to…</string>
<string name="search">Search accounts…</string>
<string name="confirmation_send">Toot!</string>
<string name="confirmation_reported">Sent!</string>
@ -106,6 +107,7 @@
<string name="visibility_private">Only followers and mentions can see</string>
<string name="pref_title_notification_settings">Notifications</string>
<string name="pref_title_notifications_enabled">Push notifications</string>
<string name="pref_title_notification_alerts">Alerts</string>
<string name="pref_title_notification_alert_sound">Notify with a sound</string>
<string name="pref_title_notification_alert_vibrate">Notify with vibration</string>
@ -117,25 +119,11 @@
<string name="pref_title_notification_filter_favourites">my posts are favourited</string>
<string name="pref_title_appearance_settings">Appearance</string>
<string name="pref_title_light_theme">Use the Light Theme</string>
<string name="action_submit">Submit</string>
<string name="action_photo_pick">Add media</string>
<string name="action_compose_options">Privacy options</string>
<string name="login_success">Welcome back!</string>
<string name="action_share">Share</string>
<string name="send_status_to">Share toot URL to…</string>
<string name="action_mute">Mute</string>
<string name="action_unmute">Unmute</string>
<string name="error_unmuting">That user wasn\'t unmuted.</string>
<string name="error_muting">That user wasn\'t muted.</string>
<string name="search">Search accounts…</string>
<string name="toggle_nsfw">NSFW</string>
<string name="action_mention">Mention</string>
<string name="notification_mention_format">%s mentioned you</string>
<string name="error_invalid_domain">Invalid domain entered</string>
<string name="error_failed_app_registration">This app could not obtain authentication from that server instance.</string>
<string name="notification_summary_large">%1$s, %2$s, %3$s and %4$d others</string>
<string name="notification_summary_medium">%1$s, %2$s, and %3$s</string>
<string name="notification_summary_small">%1$s and %2$s</string>
<string name="notification_title_summary">%d new interactions</string>
<string name="pref_title_notifications_enabled">Push notifications</string>
</resources>

Write Preview
Loading…
Cancel
Save