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

find and fix a few more places where language name needed translation

Browse source 
or to be capitalized.
This commit is contained in:
Eric House 2015-05-22 22:55:30 -07:00
parent 52269e6675
commit 1630389391
7 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,8 +72,8 @@ public class DictLangCache {
String lang = getLangName( m_context, dal.name );
if ( null != lang && 0 != lang.length() ) {
if ( ! m_map.containsValue( lang ) ) {
String locName = LocUtils.xlateLang( m_context, lang );
locName = Utils.capitalize( locName );
String locName = LocUtils.xlateLang( m_context, lang,
true );
m_map.put( locName, lang );
}
}

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -382,6 +382,7 @@ public class DictsDelegate extends ListDelegateBase
};
String name = row.getText();
String lang = DictLangCache.getLangName( m_activity, name);
lang = xlateLang( lang );
message = getString( R.string.set_default_message_fmt, name, lang );
dialog = makeAlertBuilder()
.setTitle( R.string.query_title )

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java
View file

@ -271,9 +271,10 @@ public class GameConfigDelegate extends DelegateBase
});
break;
case NO_NAME_FOUND:
String langName = DictLangCache.getLangName( m_activity,
m_gi.dictLang );
String msg = getString( R.string.no_name_found_fmt,
m_gi.nPlayers, DictLangCache.
getLangName( m_activity, m_gi.dictLang ) );
m_gi.nPlayers, xlateLang( langName ) );
dialog = makeAlertBuilder()
.setPositiveButton( R.string.button_ok, null )
// message added below since varies with language etc.

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/LookupAlert.java
View file

@ -326,7 +326,8 @@ public class LookupAlert extends LinearLayout
s_urlsAdapter = new ArrayAdapter<String>( context, LIST_LAYOUT,
s_lookupNames );
s_lang = lang;
s_langName = DictLangCache.getLangNames( context )[lang];
String langName = DictLangCache.getLangName( context, lang );
s_langName = LocUtils.xlateLang( context, langName );
}
}

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
View file

@ -138,7 +138,8 @@ public class MultiService {
String inviter = intent.getStringExtra( INVITER );
int msgID = (null == inviter) ? R.string.invite_dict_missing_body_noname_fmt
: R.string.invite_dict_missing_body_fmt;
String msg = LocUtils.getString( context, msgID, inviter, dict, langStr );
String msg = LocUtils.getString( context, msgID, inviter, dict,
LocUtils.xlateLang( context, langStr));
return LocUtils.makeAlertBuilder( context )
.setTitle( R.string.invite_dict_missing_title )

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java
View file

@ -57,11 +57,11 @@ public class RefreshNamesTask extends AsyncTask<Void, Void, String[]> {
m_lang = lang;
m_nInGame = nInGame;
String langName = DictLangCache.getLangName( context, lang );
langName = LocUtils.xlateLang( context, langName );
String msg = LocUtils.getString( context, R.string.public_names_progress_fmt,
nInGame,
DictLangCache.getLangName(context,lang) );
m_progress = ProgressDialog.show( context, msg, null, true,
true );
nInGame, langName );
m_progress = ProgressDialog.show( context, msg, null, true, true );
}
@Override

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

@ -253,8 +253,9 @@ public class StudyListDelegate extends ListDelegateBase
makeAdapter();
String langName = DictLangCache.getLangNames( m_activity )[lang];
m_origTitle = getString( R.string.studylist_title_fmt, langName );
String langName = DictLangCache.getLangName( m_activity, lang );
m_origTitle = getString( R.string.studylist_title_fmt,
xlateLang( langName ) );
setTitleBar();
}
@ -284,7 +285,7 @@ public class StudyListDelegate extends ListDelegateBase
String[] myNames = new String[m_langCodes.length];
for ( int ii = 0; ii < m_langCodes.length; ++ii ) {
int lang = m_langCodes[ii];
myNames[ii] = names[lang];
myNames[ii] = xlateLang( names[lang], true );
if ( lang == startLang ) {
startIndex = ii;
}