Change name by title and sort trad

This commit is contained in:
J-Jamet
2018-02-24 13:46:20 +01:00
parent 242427d348
commit cd9f82696a
3 changed files with 12 additions and 8 deletions

View File

@@ -143,18 +143,18 @@ public abstract class ListNodesActivity extends LockCloseListActivity
} }
private void setSortMenuText(Menu menu) { private void setSortMenuText(Menu menu) {
boolean sortByName = false; boolean sortByTitle = false;
// Will be null if onPrepareOptionsMenu is called before onCreate // Will be null if onPrepareOptionsMenu is called before onCreate
if (prefs != null) { if (prefs != null) {
sortByName = prefs.getBoolean(getString(R.string.sort_key), getResources().getBoolean(R.bool.sort_default)); sortByTitle = prefs.getBoolean(getString(R.string.sort_key), getResources().getBoolean(R.bool.sort_default));
} }
int resId; int resId;
if ( sortByName ) { if ( sortByTitle ) {
resId = R.string.sort_db; resId = R.string.sort_creation_time;
} else { } else {
resId = R.string.sort_name; resId = R.string.sort_title;
} }
menu.findItem(R.id.menu_sort).setTitle(resId); menu.findItem(R.id.menu_sort).setTitle(resId);

View File

@@ -71,7 +71,7 @@
<string name="entry_not_found">Entry data not found.</string> <string name="entry_not_found">Entry data not found.</string>
<string name="entry_password">Mot de passe</string> <string name="entry_password">Mot de passe</string>
<string name="entry_save">Enregistrer</string> <string name="entry_save">Enregistrer</string>
<string name="entry_title">Nom</string> <string name="entry_title">Titre</string>
<string name="entry_url">URL</string> <string name="entry_url">URL</string>
<string name="entry_user_name">Nom d\'utilisateur</string> <string name="entry_user_name">Nom d\'utilisateur</string>
<string name="error_arc4">Le chiffrement de flux ArcFour n\'est pas supporté.</string> <string name="error_arc4">Le chiffrement de flux ArcFour n\'est pas supporté.</string>
@@ -182,6 +182,8 @@
<string name="show_password">Afficher le mot de passe</string> <string name="show_password">Afficher le mot de passe</string>
<string name="sort_name">Tri par nom</string> <string name="sort_name">Tri par nom</string>
<string name="sort_db">Tri par défaut (base de données)</string> <string name="sort_db">Tri par défaut (base de données)</string>
<string name="sort_title">Tri par Titre</string>
<string name="sort_creation_time">Tri par Date de Création</string>
<string name="special">Spécial</string> <string name="special">Spécial</string>
<string name="search_hint">Nom/description</string> <string name="search_hint">Nom/description</string>
<string name="search_results">Résultats</string> <string name="search_results">Résultats</string>

View File

@@ -70,7 +70,7 @@
<string name="entry_not_found">Entry data not found.</string> <string name="entry_not_found">Entry data not found.</string>
<string name="entry_password">Password:</string> <string name="entry_password">Password:</string>
<string name="entry_save">Save</string> <string name="entry_save">Save</string>
<string name="entry_title">Name: </string> <string name="entry_title">Title: </string>
<string name="entry_url">URL: </string> <string name="entry_url">URL: </string>
<string name="entry_user_name">User Name: </string> <string name="entry_user_name">User Name: </string>
<string name="error_arc4">The ArcFour stream cipher is not supported.</string> <string name="error_arc4">The ArcFour stream cipher is not supported.</string>
@@ -180,8 +180,10 @@
<string name="space">Space</string> <string name="space">Space</string>
<string name="search_label">Search</string> <string name="search_label">Search</string>
<string name="show_password">Show password</string> <string name="show_password">Show password</string>
<string name="sort_name">Sort by name</string> <string name="sort_name">Sort by Name</string>
<string name="sort_db">DB sort order</string> <string name="sort_db">DB sort order</string>
<string name="sort_title">Sort by Title</string>
<string name="sort_creation_time">Sort by Creation Time</string>
<string name="special">Special</string> <string name="special">Special</string>
<string name="search_hint">Search</string> <string name="search_hint">Search</string>
<string name="search_results">Search results</string> <string name="search_results">Search results</string>