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

Merge branch 'android_branch' into android_translate

Browse source
This commit is contained in:
Eric House 2016-01-25 07:30:07 -08:00
commit 247f6c2f6e
6 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4497,6 +4497,7 @@ XLATE-ME
you get this error message
*/
public static final int no_games_to_refresh=0x7f050096;
public static final int no_invites=0x7f05033b;
/** <string name="no_market">Google Play app not found</string>
*/
public static final int no_market=0x7f05027a;

3
xwords4/android/XWords4/assets/changes.html
View file

@ -40,6 +40,9 @@
<li>Finish fixing problem with moves being dropped</li>
<li>Add Japanese translation; update Catalan, Dutch, and French
(Thanks to Weblate and the translators!)</li>
<li>Make it easier to "discover" and enable play-via-SMS (GSM
phones only)</li>

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

@ -2652,4 +2652,6 @@
<string name="not_again_dfltname_fmt">You are using the default
player name \"%1$s\". Would you like to personalize with your own
name before you create this game?</string>
<string name="no_invites">This game has sent no invitations</string>
</resources>

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

@ -2268,4 +2268,5 @@
<string name="not_again_dfltname_fmt">Uoy era gnisu eht tluafed
reyalp eman \"%1$s\". Dluow uoy ekil ot ezilanosrep htiw ruoy nwo
eman erofeb uoy etaerc siht ?emag</string>
<string name="no_invites">Siht emag sah tnes on snoitativni</string>
</resources>

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

@ -2268,4 +2268,5 @@
<string name="not_again_dfltname_fmt">YOU ARE USING THE DEFAULT
PLAYER NAME \"%1$s\". WOULD YOU LIKE TO PERSONALIZE WITH YOUR OWN
NAME BEFORE YOU CREATE THIS GAME?</string>
<string name="no_invites">THIS GAME HAS SENT NO INVITATIONS</string>
</resources>

57
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
View file

@ -511,37 +511,44 @@ public class DBUtils {
public String getAsText( Context context )
{
String result;
int count = m_timestamps.size();
String[] strs = new String[count];
for ( int ii = 0; ii < count; ++ii ) {
InviteMeans means = m_means.get(ii);
String target = m_targets.get(ii);
String timestamp = m_timestamps.get(ii).toString();
String msg;
if ( 0 == count ) {
result = LocUtils.getString( context, R.string.no_invites );
} else {
String[] strs = new String[count];
for ( int ii = 0; ii < count; ++ii ) {
InviteMeans means = m_means.get(ii);
String target = m_targets.get(ii);
String timestamp = m_timestamps.get(ii).toString();
String msg;
switch ( means ) {
case SMS:
msg = LocUtils.getString( context, R.string.invit_expl_sms_fmt,
target, timestamp );
break;
case BLUETOOTH:
String devName = BTService.nameForAddr( target );
msg = LocUtils.getString( context, R.string.invit_expl_bt_fmt,
devName, timestamp );
break;
case RELAY:
msg = LocUtils.getString( context, R.string.invit_expl_relay_fmt,
timestamp );
break;
default:
msg = LocUtils.getString( context, R.string.invit_expl_notarget_fmt,
means.toString(), timestamp );
switch ( means ) {
case SMS:
msg = LocUtils.getString( context, R.string.invit_expl_sms_fmt,
target, timestamp );
break;
case BLUETOOTH:
String devName = BTService.nameForAddr( target );
msg = LocUtils.getString( context, R.string.invit_expl_bt_fmt,
devName, timestamp );
break;
case RELAY:
msg = LocUtils.getString( context, R.string.invit_expl_relay_fmt,
timestamp );
break;
default:
msg = LocUtils.getString( context, R.string.invit_expl_notarget_fmt,
means.toString(), timestamp );
}
strs[ii] = msg;
}
strs[ii] = msg;
result = TextUtils.join( "\n\n", strs );
}
return TextUtils.join( "\n\n", strs );
return result;
}
}
public static SentInvitesInfo getInvitesFor( Context context, long rowid )