Skip to content

Commit 58fa657

Browse files
author
andybryant
committed
Issue #218 - Fixed issue loading app in Spanish (and added tickler view to all languages)
Issue #220 - Fixed perspective menu to show tickler Issue #221 - Fixed crash when changing view settings in Japanese and Spanish git-svn-id: http://android-shuffle.googlecode.com/svn/trunk@265 c433d9f2-e643-0410-a449-b9b772e888ec
1 parent 5c70d3f commit 58fa657

File tree

10 files changed

+18
-19
lines changed

10 files changed

+18
-19
lines changed

client/res/values-de/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<item>Nächste Schritte</item>
3434
<item>Projekte</item>
3535
<item>Kategorien</item>
36+
<item>Erinnerung</item>
3637
</array>
3738
<array name="view_types">
3839
<item>Ausklappbar</item>

client/res/values-es/arrays.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<item>Proyectos</item>
3535
<item>Contextos</item>
3636
<item>Recordatorio</item>
37-
<item>Papelera</item>
3837
</array>
3938
<array name="view_types">
4039
<item>Pantalla actual</item>
@@ -189,12 +188,6 @@
189188
<item>"10080"</item>
190189
</string-array>
191190

192-
<string-array name="list_preferences_flag_values" translatable="false">
193-
<item>ignorado</item>
194-
<item>si</item>
195-
<item>no</item>
196-
</string-array>
197-
198191
<string-array name="list_preferences_active_labels" translatable="false">
199192
<item>Mostrar todas</item>
200193
<item>Mostrar activas</item>

client/res/values-fr/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<item>Tâches suivantes</item>
3434
<item>Projets</item>
3535
<item>Contextes</item>
36+
<item>Rappel</item>
3637
</array>
3738
<array name="view_types">
3839
<item>Liste expansible</item>

client/res/values-ja/arrays.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,6 @@
188188
<item>"10080"</item>
189189
</string-array>
190190

191-
<string-array name="list_preferences_flag_values" translatable="false">
192-
<item>無視</item>
193-
<item>はい</item>
194-
<item>いいえ</item>
195-
</string-array>
196-
197191
<string-array name="list_preferences_active_labels" translatable="false">
198192
<item>全て表示</item>
199193
<item>アクティブな物だけ表示</item>

client/res/values-pl/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<item>Natępne działania</item>
3434
<item>Projekty</item>
3535
<item>Konteksty</item>
36+
<item>Przypomnienie</item>
3637
</array>
3738
<array name="view_types">
3839
<item>Lista rozszerzalna</item>

client/res/values-zh-rCN/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<item>临近活动</item>
3434
<item>内容</item>
3535
<item>情景</item>
36+
<item>提醒</item>
3637
</array>
3738
<array name="view_types">
3839
<item>可收缩列表</item>

client/res/values-zh-rTW/arrays.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<item>臨近活動</item>
3434
<item>內容</item>
3535
<item>情景</item>
36+
<item>提醒</item>
3637
</array>
3738
<array name="view_types">
3839
<item>可收縮清單</item>

client/res/values/arrays.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,31 +188,32 @@
188188
<item>"10080"</item>
189189
</string-array>
190190

191+
<!-- don't translate these key values -->
191192
<string-array name="list_preferences_flag_values" translatable="false">
192193
<item>ignored</item>
193194
<item>yes</item>
194195
<item>no</item>
195196
</string-array>
196197

197-
<string-array name="list_preferences_active_labels" translatable="false">
198+
<string-array name="list_preferences_active_labels">
198199
<item>Show All</item>
199200
<item>Show Active Only</item>
200201
<item>Hide Active</item>
201202
</string-array>
202203

203-
<string-array name="list_preferences_deleted_labels" translatable="false">
204+
<string-array name="list_preferences_deleted_labels">
204205
<item>Show All</item>
205206
<item>Show Deleted Only</item>
206207
<item>Hide Deleted</item>
207208
</string-array>
208209

209-
<string-array name="list_preferences_pending_labels" translatable="false">
210+
<string-array name="list_preferences_pending_labels">
210211
<item>Show All</item>
211212
<item>Show Pending Only</item>
212213
<item>Hide Pending</item>
213214
</string-array>
214215

215-
<string-array name="list_preferences_completed_labels" translatable="false">
216+
<string-array name="list_preferences_completed_labels">
216217
<item>Show All</item>
217218
<item>Show Completed Only</item>
218219
<item>Hide Completed</item>

client/src/org/dodgybits/shuffle/android/core/view/MenuUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public static void addViewMenuItems(Menu menu, int currentViewMenuId) {
134134
.setChecked(PROJECT_ID == currentViewMenuId);
135135
viewMenu.add(Menu.NONE, CONTEXT_ID, 4, R.string.title_context)
136136
.setChecked(CONTEXT_ID == currentViewMenuId);
137-
viewMenu.add(Menu.NONE, TICKLER_ID, 5, R.string.title_context)
137+
viewMenu.add(Menu.NONE, TICKLER_ID, 5, R.string.title_tickler)
138138
.setChecked(TICKLER_ID == currentViewMenuId);
139139
}
140140

client/src/org/dodgybits/shuffle/android/preference/model/ListPreferenceSettings.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,13 @@ public Flag getPending(Context context) {
170170
}
171171

172172
private Flag getValue(Context context, String setting, Flag defaultValue) {
173-
Flag value = Flag.valueOf(getSharedPreferences(context).getString(mPrefix + setting, defaultValue.name()));
173+
String valueStr = getSharedPreferences(context).getString(mPrefix + setting, defaultValue.name());
174+
Flag value = defaultValue;
175+
try {
176+
value = Flag.valueOf(valueStr);
177+
} catch (IllegalArgumentException e) {
178+
Ln.e("Unrecognized flag setting %s for settings %s using default %s", valueStr, setting, defaultValue);
179+
}
174180
Ln.d("Got value %s for settings %s%s with default %s", value, mPrefix, setting, defaultValue);
175181
return value;
176182
}

0 commit comments

Comments
 (0)