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

improve download-or-cancel messages

Browse source
This commit is contained in:
Eric House 2012-11-28 21:07:03 -08:00
parent 8250447eca
commit bffb231d13
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1461,9 +1461,10 @@
downloading and not opening the game. This first message downloading and not opening the game. This first message
takes wordlist name and language substituted in for %1$ and takes wordlist name and language substituted in for %1$ and
%2$ --> %2$ -->
<string name="no_dictf">Unable to open game \"%1$s\" because no <string name="no_dictf">You need to download a replacement %2$s
%2$s wordlist found. (It may have been deleted, or stored on wordlist before you can open game \"%1$s\". (The original may have
an external card that is no longer available.)</string> been deleted or stored on an external card that is no longer
available.)</string>
<!-- This is an alternative message presented when there's also <!-- This is an alternative message presented when there's also
the option of downloading another wordlist. Game name, the option of downloading another wordlist. Game name,
@ -2114,10 +2115,10 @@
play Crosswords using the wordlist %2$s (for play in %3$s), but it play Crosswords using the wordlist %2$s (for play in %3$s), but it
is not installed. Would you like to download the wordlist or is not installed. Would you like to download the wordlist or
decline the invitation?</string> decline the invitation?</string>
<string name="invite_dict_missing_body_nonamef">You have been invited to <string name="invite_dict_missing_body_nonamef">You have been
play Crosswords using the wordlist %2$s (for play in %3$s), but it invited to play Crosswords using the wordlist %2$s (for play in
is not installed. Would you like to download the wordlist or %3$s), but it is not installed. Would you like to download the
decline the invitation?</string> wordlist?</string>
<string name="button_decline">Decline</string> <string name="button_decline">Decline</string>
<string name="downloadingf">Downloading %s...</string> <string name="downloadingf">Downloading %s...</string>

16
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -57,9 +57,10 @@ public class GamesList extends XWListActivity
private static final int WARN_NODICT = DlgDelegate.DIALOG_LAST + 1; private static final int WARN_NODICT = DlgDelegate.DIALOG_LAST + 1;
private static final int WARN_NODICT_SUBST = WARN_NODICT + 1; private static final int WARN_NODICT_SUBST = WARN_NODICT + 1;
private static final int SHOW_SUBST = WARN_NODICT + 2; private static final int WARN_NODICT_NEW = WARN_NODICT + 2;
private static final int GET_NAME = WARN_NODICT + 3; private static final int SHOW_SUBST = WARN_NODICT + 3;
private static final int RENAME_GAME = WARN_NODICT + 4; private static final int GET_NAME = WARN_NODICT + 4;
private static final int RENAME_GAME = WARN_NODICT + 5;
private static final String SAVE_ROWID = "SAVE_ROWID"; private static final String SAVE_ROWID = "SAVE_ROWID";
private static final String SAVE_DICTNAMES = "SAVE_DICTNAMES"; private static final String SAVE_DICTNAMES = "SAVE_DICTNAMES";
@ -102,6 +103,7 @@ public class GamesList extends XWListActivity
AlertDialog.Builder ab; AlertDialog.Builder ab;
switch ( id ) { switch ( id ) {
case WARN_NODICT: case WARN_NODICT:
case WARN_NODICT_NEW:
case WARN_NODICT_SUBST: case WARN_NODICT_SUBST:
lstnr = new DialogInterface.OnClickListener() { lstnr = new DialogInterface.OnClickListener() {
public void onClick( DialogInterface dlg, int item ) { public void onClick( DialogInterface dlg, int item ) {
@ -125,6 +127,10 @@ public class GamesList extends XWListActivity
if ( WARN_NODICT == id ) { if ( WARN_NODICT == id ) {
message = getString( R.string.no_dictf, message = getString( R.string.no_dictf,
gameName, langName ); gameName, langName );
} else if ( WARN_NODICT_NEW == id ) {
message =
getString( R.string.invite_dict_missing_body_nonamef,
null, m_missingDictName, langName );
} else { } else {
message = getString( R.string.no_dict_substf, message = getString( R.string.no_dict_substf,
gameName, m_missingDictName, gameName, m_missingDictName,
@ -134,7 +140,7 @@ public class GamesList extends XWListActivity
ab = new AlertDialog.Builder( this ) ab = new AlertDialog.Builder( this )
.setTitle( R.string.no_dict_title ) .setTitle( R.string.no_dict_title )
.setMessage( message ) .setMessage( message )
.setPositiveButton( R.string.button_ok, null ) .setPositiveButton( R.string.button_cancel, null )
.setNegativeButton( R.string.button_download, lstnr ) .setNegativeButton( R.string.button_download, lstnr )
; ;
if ( WARN_NODICT_SUBST == id ) { if ( WARN_NODICT_SUBST == id ) {
@ -691,7 +697,7 @@ public class GamesList extends XWListActivity
m_netLaunchInfo = nli; m_netLaunchInfo = nli;
m_missingDictLang = nli.lang; m_missingDictLang = nli.lang;
m_missingDictName = nli.dict; m_missingDictName = nli.dict;
showDialog( WARN_NODICT ); showDialog( WARN_NODICT_NEW );
} }
return haveDict; return haveDict;
} }