Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

tweak explanations for new game-over dialog checkboxes

Browse source
This commit is contained in:
Eric House 2022-08-07 20:24:24 -07:00
parent 896e86fd28
commit 736dc2039c
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameOverAlert.java
View file

@ -157,6 +157,7 @@ public class GameOverAlert extends XWDialogFragment
{ {
if ( isChecked ) { if ( isChecked ) {
DlgDelegate.Builder builder; DlgDelegate.Builder builder;
CharSequence buttonText = bv.getText();
if ( bv == mArchiveBox ) { if ( bv == mArchiveBox ) {
mDeleteBox.setChecked( false ); mDeleteBox.setChecked( false );
@ -164,12 +165,14 @@ public class GameOverAlert extends XWDialogFragment
.getString( getContext(), R.string.group_name_archive ); .getString( getContext(), R.string.group_name_archive );
builder = mDlgDlgt.makeNotAgainBuilder( R.string.key_na_archivecheck, builder = mDlgDlgt.makeNotAgainBuilder( R.string.key_na_archivecheck,
R.string.not_again_archivecheck_fmt, R.string.not_again_archivecheck_fmt,
archiveName ); buttonText, archiveName );
} else { } else {
Assert.assertTrueNR( bv == mDeleteBox ); Assert.assertTrueNR( bv == mDeleteBox );
mArchiveBox.setChecked( false ); mArchiveBox.setChecked( false );
builder = mDlgDlgt.makeNotAgainBuilder( R.string.key_na_deletecheck, builder = mDlgDlgt.makeNotAgainBuilder( R.string.key_na_deletecheck,
R.string.not_again_deletecheck ); R.string.not_again_deletecheck_fmt,
buttonText );
} }
builder.show(); builder.show();

12
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -1947,12 +1947,22 @@
<item quantity="one">%1$s (%2$d game)</item> <item quantity="one">%1$s (%2$d game)</item>
<item quantity="other">%1$s (%2$d games)</item> <item quantity="other">%1$s (%2$d games)</item>
</plurals> </plurals>
<!-- Button shown in game over dialog triggering creation of new <!-- Button shown in game-over dialog triggering creation of new
game with the same players and parameters as the one that game with the same players and parameters as the one that
just ended. --> just ended. -->
<string name="button_rematch">Rematch</string> <string name="button_rematch">Rematch</string>
<!-- Menu to move selected game to archive group -->
<string name="button_archive">Archive\u200C</string> <string name="button_archive">Archive\u200C</string>
<!-- Move-to-archive-after checkbox text in game-over dialog -->
<string name="checkbox_archive">Move to Archive</string> <string name="checkbox_archive">Move to Archive</string>
<!-- Explanation of move-to-archive-after checkbox -->
<string name="not_again_archivecheck_fmt">Check the “%1$s” box to
move this game to the %2$s group.</string>
<!-- Explanation of delete-after button -->
<string name="not_again_deletecheck_fmt">Check the “%1$s” box to
delete this game.</string>
<!-- Name of the group where games are moved when "archived" -->
<string name="group_name_archive">Archive</string> <string name="group_name_archive">Archive</string>
<!-- When you choose "delete" from the game-over dialog, you see <!-- When you choose "delete" from the game-over dialog, you see
this string in a comfirmation dialog --> this string in a comfirmation dialog -->

4
xwords4/android/app/src/main/res/values/tmpstrings.xml
View file

@ -5,8 +5,4 @@
<string name="dup_allscores_fmt">All scores: %1$s</string> <string name="dup_allscores_fmt">All scores: %1$s</string>
<string name="not_again_archivecheck_fmt">Check this box to move
this game to the “%1$s” group.</string>
<string name="not_again_deletecheck">Check this box to delete this
game.</string>
</resources> </resources>