Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

use plurals for another string, and add getQuantityString to delegates

Browse source 
baseclass.
This commit is contained in:
Eric House 2015-03-17 21:22:37 -07:00
parent 5d64089a5b
commit fff57a5638
7 changed files with 632 additions and 617 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1214
xwords4/android/XWords4/archive/R.java
View file

File diff suppressed because it is too large Load diff

6
xwords4/android/XWords4/res/values-fr/strings.xml
View file

@ -158,8 +158,10 @@ obtenir une copie avec les mêmes paramètres.</string>
list_item_rename) --> list_item_rename) -->
<string name="rename_label">Changer le nom de la partie pour :</string> <string name="rename_label">Changer le nom de la partie pour :</string>
<string name="confirm_seldeletes_fmt">Êtes-vous sûr de vouloir effacer les <plurals name="confirm_seldeletes_fmt">
%1$d parties sélectionnées ? Cette action ne peut pas être annulée.</string> <item quantity="other">Êtes-vous sûr de vouloir effacer les
%1$d parties sélectionnées ? Cette action ne peut pas être annulée.</item>
</plurals>
<!-- Text of confirmation dialog posted when list_item_reset menu <!-- Text of confirmation dialog posted when list_item_reset menu
is selected --> is selected -->

6
xwords4/android/XWords4/res/values/strings.xml
View file

@ -162,8 +162,10 @@
<string name="rename_label_caveat">Change the name of this game <string name="rename_label_caveat">Change the name of this game
(on this device only) to:</string> (on this device only) to:</string>
<string name="confirm_seldeletes_fmt">Are you sure you want to delete <plurals name="confirm_seldeletes_fmt">
the %1$d selected game[s]? This action cannot be undone.</string> <item quantity="other">Are you sure you want to delete
the %1$d selected game[s]? This action cannot be undone.</item>
</plurals>
<!-- Text of confirmation dialog posted when list_item_reset menu <!-- Text of confirmation dialog posted when list_item_reset menu
is selected --> is selected -->

6
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

@ -141,8 +141,10 @@
<string name="rename_label">Egnahc eht eman fo siht emag ot:</string> <string name="rename_label">Egnahc eht eman fo siht emag ot:</string>
<string name="rename_label_caveat">Egnahc eht eman fo siht emag <string name="rename_label_caveat">Egnahc eht eman fo siht emag
no( siht ecived )ylno ot:</string> no( siht ecived )ylno ot:</string>
<string name="confirm_seldeletes_fmt">Era uoy erus uoy tnaw ot eteled <plurals name="confirm_seldeletes_fmt">
eht %1$d detceles ?]s[emag Siht noitca tonnac eb enodnu.</string> <item quantity="other">Era uoy erus uoy tnaw ot eteled
eht %1$d detceles ?]s[emag Siht noitca tonnac eb enodnu.</item>
</plurals>
<!-- Text of confirmation dialog posted when list_item_reset menu <!-- Text of confirmation dialog posted when list_item_reset menu
is selected --> is selected -->
<string name="confirm_reset_fmt">Era uoy erus uoy tnaw ot teser eht %1$d <string name="confirm_reset_fmt">Era uoy erus uoy tnaw ot teser eht %1$d

6
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

@ -141,8 +141,10 @@
<string name="rename_label">CHANGE THE NAME OF THIS GAME TO:</string> <string name="rename_label">CHANGE THE NAME OF THIS GAME TO:</string>
<string name="rename_label_caveat">CHANGE THE NAME OF THIS GAME <string name="rename_label_caveat">CHANGE THE NAME OF THIS GAME
(ON THIS DEVICE ONLY) TO:</string> (ON THIS DEVICE ONLY) TO:</string>
<string name="confirm_seldeletes_fmt">ARE YOU SURE YOU WANT TO DELETE <plurals name="confirm_seldeletes_fmt">
THE %1$d SELECTED GAME[S]? THIS ACTION CANNOT BE UNDONE.</string> <item quantity="other">ARE YOU SURE YOU WANT TO DELETE
THE %1$d SELECTED GAME[S]? THIS ACTION CANNOT BE UNDONE.</item>
</plurals>
<!-- Text of confirmation dialog posted when list_item_reset menu <!-- Text of confirmation dialog posted when list_item_reset menu
is selected --> is selected -->
<string name="confirm_reset_fmt">ARE YOU SURE YOU WANT TO RESET THE %1$d <string name="confirm_reset_fmt">ARE YOU SURE YOU WANT TO RESET THE %1$d

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
View file

@ -209,6 +209,13 @@ public class DelegateBase implements DlgClickNotify,
return LocUtils.getString( m_activity, resID, params ); return LocUtils.getString( m_activity, resID, params );
} }
protected String getQuantityString( int resID, int quantity,
Object... params )
{
return LocUtils.getQuantityString( m_activity, resID, quantity,
params );
}
protected String[] getStringArray( int resID ) protected String[] getStringArray( int resID )
{ {
return LocUtils.getStringArray( m_activity, resID ); return LocUtils.getStringArray( m_activity, resID );

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -1438,8 +1438,8 @@ public class GamesListDelegate extends ListDelegateBase
// Game menus: one or more games selected // Game menus: one or more games selected
case R.id.games_game_delete: case R.id.games_game_delete:
String msg = getString( R.string.confirm_seldeletes_fmt, String msg = getQuantityString( R.plurals.confirm_seldeletes_fmt,
selRowIDs.length ); selRowIDs.length, selRowIDs.length );
showConfirmThen( msg, R.string.button_delete, showConfirmThen( msg, R.string.button_delete,
Action.DELETE_GAMES, selRowIDs ); Action.DELETE_GAMES, selRowIDs );
break; break;