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

fix sorting when lang names are localized

Browse source
This commit is contained in:
Eric House 2021-11-28 12:28:52 -08:00
parent b6c9e11f87
commit a738e60f1d
2 changed files with 47 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
View file

@ -335,6 +335,21 @@ public class DictLangCache {
return code; return code;
} }
public static String userLangForLc( Context context, String lc )
{
String result = null;
Map<Integer, String> namesArray = getLangNames( context );
getLangCodeStr( context, 0 ); // force load of s_langCodeStrs
for ( int code = 0; code < s_langCodeStrs.length; ++code ) {
if ( lc.equals(s_langCodeStrs[code]) ) {
result = namesArray.get(code);
break;
}
}
return result;
}
public static String getLangName( Context context, String dict ) public static String getLangName( Context context, String dict )
{ {
int code = getDictLangCode( context, dict ); int code = getDictLangCode( context, dict );

53
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -97,7 +97,6 @@ public class DictsDelegate extends ListDelegateBase
private boolean m_quickFetchMode; private boolean m_quickFetchMode;
private String[] m_langs; private String[] m_langs;
private ListView m_listView;
private CheckBox m_checkbox; private CheckBox m_checkbox;
private String[] m_locNames; private String[] m_locNames;
private String m_finishOnName; private String m_finishOnName;
@ -113,19 +112,22 @@ public class DictsDelegate extends ListDelegateBase
private static class DictInfo implements Comparable, Serializable { private static class DictInfo implements Comparable, Serializable {
public String m_name; public String m_name;
public String m_lang; public String m_localLang; // what we display to user, i.e. translated
public String m_urlLang; // what needs to be in URL
public int m_nWords; public int m_nWords;
public long m_nBytes; public long m_nBytes;
public String m_note; public String m_note;
public DictInfo( String name, String lang, int nWords, public DictInfo( String name, String urlLang, String localLang,
long nBytes, String note ) int nWords, long nBytes, String note )
{ {
m_name = name; m_name = name;
m_lang = lang; m_localLang = localLang;
m_urlLang = urlLang;
m_nWords = nWords; m_nWords = nWords;
m_nBytes = nBytes; m_nBytes = nBytes;
m_note = note; m_note = note;
} }
@Override
public int compareTo( Object obj ) { public int compareTo( Object obj ) {
DictInfo other = (DictInfo)obj; DictInfo other = (DictInfo)obj;
return m_name.compareTo( other.m_name ); return m_name.compareTo( other.m_name );
@ -169,6 +171,7 @@ public class DictsDelegate extends ListDelegateBase
} }
ArrayList<Object> items = makeLangItems( langName ); ArrayList<Object> items = makeLangItems( langName );
Assert.assertTrueNR( 0 < items.size() );
alist.add( new LangInfo( ii, items.size() ) ); alist.add( new LangInfo( ii, items.size() ) );
if ( ! m_closedLangs.contains( langName ) ) { if ( ! m_closedLangs.contains( langName ) ) {
@ -437,8 +440,7 @@ public class DictsDelegate extends ListDelegateBase
m_locNames = getStringArray( R.array.loc_names ); m_locNames = getStringArray( R.array.loc_names );
m_listView = getListView(); getListView().setOnItemLongClickListener( this );
m_listView.setOnItemLongClickListener( this );
m_checkbox = (CheckBox)findViewById( R.id.show_remote ); m_checkbox = (CheckBox)findViewById( R.id.show_remote );
m_checkbox.setOnClickListener( this ); m_checkbox.setOnClickListener( this );
@ -601,7 +603,7 @@ public class DictsDelegate extends ListDelegateBase
if ( cached instanceof DictInfo ) { if ( cached instanceof DictInfo ) {
DictInfo info = (DictInfo)cached; DictInfo info = (DictInfo)cached;
String name = entry.getKey(); String name = entry.getKey();
Uri uri = Utils.makeDictUri( m_activity, info.m_lang, Uri uri = Utils.makeDictUri( m_activity, info.m_urlLang,
name ); name );
uris[count] = uri; uris[count] = uri;
names[count] = name; names[count] = name;
@ -855,6 +857,7 @@ public class DictsDelegate extends ListDelegateBase
// post so other SDCardNotifiee implementations get a chance // post so other SDCardNotifiee implementations get a chance
// to process first: avoid race conditions // to process first: avoid race conditions
post( new Runnable() { post( new Runnable() {
@Override
public void run() { public void run() {
mkListAdapter(); mkListAdapter();
} }
@ -943,7 +946,7 @@ public class DictsDelegate extends ListDelegateBase
langs.addAll( m_remoteInfo.keySet() ); langs.addAll( m_remoteInfo.keySet() );
} }
m_langs = langs.toArray( new String[langs.size()] ); m_langs = langs.toArray( new String[langs.size()] );
Arrays.sort( m_langs ); Arrays.sort( m_langs, java.text.Collator.getInstance() );
} }
private void mkListAdapter() private void mkListAdapter()
@ -1149,7 +1152,7 @@ public class DictsDelegate extends ListDelegateBase
@Override @Override
public void onClick( View view ) { public void onClick( View view ) {
DwnldDelegate. DwnldDelegate.
downloadDictInBack( m_activity, info.m_lang, downloadDictInBack( m_activity, info.m_urlLang,
info.m_name, info.m_name,
DictsDelegate.this ); DictsDelegate.this );
} }
@ -1426,15 +1429,23 @@ public class DictsDelegate extends ListDelegateBase
m_remoteInfo = new HashMap<>(); m_remoteInfo = new HashMap<>();
for ( int ii = 0; !isCancelled() && ii < nLangs; ++ii ) { for ( int ii = 0; !isCancelled() && ii < nLangs; ++ii ) {
JSONObject langObj = langs.getJSONObject( ii ); JSONObject langObj = langs.getJSONObject( ii );
String langName = langObj.getString( "lang" ); String lc = langObj.optString( "lc", null );
String urlLangName = langObj.getString( "lang" );
String localLangName = null;
if ( null != lc ) {
localLangName = DictLangCache.userLangForLc( m_activity, lc );
}
if ( null == localLangName ) {
localLangName = urlLangName;
}
if ( null != m_filterLang && if ( null != m_filterLang &&
! m_filterLang.equals( langName ) ) { ! m_filterLang.equals( localLangName ) ) {
continue; continue;
} }
if ( ! curLangs.contains( langName ) ) { if ( ! curLangs.contains( localLangName ) ) {
closedLangs.add( langName ); closedLangs.add( localLangName );
} }
JSONArray dicts = langObj.getJSONArray( "dicts" ); JSONArray dicts = langObj.getJSONArray( "dicts" );
@ -1451,13 +1462,13 @@ public class DictsDelegate extends ListDelegateBase
if ( 0 == note.length() ) { if ( 0 == note.length() ) {
note = null; note = null;
} }
DictInfo info = new DictInfo( name, langName, nWords, DictInfo info = new DictInfo( name, urlLangName, localLangName,
nBytes, note ); nWords, nBytes, note );
if ( !m_quickFetchMode ) { if ( !m_quickFetchMode ) {
// Check if we have it and it needs an update // Check if we have it and it needs an update
if ( DictLangCache.haveDict( m_activity, if ( DictLangCache.haveDict( m_activity,
langName, name )){ localLangName, name )){
boolean matches = true; boolean matches = true;
String curSum = DictLangCache String curSum = DictLangCache
.getDictMD5Sum( m_activity, name ); .getDictMD5Sum( m_activity, name );
@ -1477,7 +1488,7 @@ public class DictsDelegate extends ListDelegateBase
if ( !matches ) { if ( !matches ) {
Uri uri = Uri uri =
Utils.makeDictUri( m_activity, Utils.makeDictUri( m_activity,
langName, name ); urlLangName, name );
m_needUpdates.put( name, uri ); m_needUpdates.put( name, uri );
} }
} }
@ -1485,10 +1496,10 @@ public class DictsDelegate extends ListDelegateBase
dictNames.add( info ); dictNames.add( info );
} }
if ( 0 < dictNames.size() ) { if ( 0 < dictNames.size() ) {
DictInfo[] asArray = new DictInfo[dictNames.size()]; DictInfo[] asArray = dictNames
asArray = dictNames.toArray( asArray ); .toArray( new DictInfo[dictNames.size()] );
Arrays.sort( asArray ); Arrays.sort( asArray );
m_remoteInfo.put( langName, asArray ); m_remoteInfo.put( localLangName, asArray );
} }
} }