yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00
Code Issues Releases Wiki Activity

more standard way for language option

Browse source
This commit is contained in:
Nikolay Pultsin 2013-09-21 21:15:15 +01:00
parent 1bc4d3ad0b
commit 4cebfcde2b
2 changed files with 11 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/resources/application/en.xml
View file

@ -873,7 +873,4 @@
<node name="unsupportedFileFormat" value="File format is not supported for '%s'"/>
<node name="errorParsingRtf" value="Rtf parsing error in: %s"/>
</node>
<node name="language-self">
<node name="all" value="All languages"/>
</node>
</resources>

35
src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
View file

@ -24,7 +24,6 @@ import java.util.*;
import android.content.Intent;
import android.net.Uri;
import android.util.Log;
import android.view.KeyEvent;
import org.geometerplus.zlibrary.core.application.ZLKeyBindings;
@ -473,31 +472,19 @@ public class PreferenceActivity extends ZLPreferenceActivity {
// final ZLStringPreference langCodePref = new ZLStringOptionPreference(this, DictionaryUtil.PreferredLanguageOption, dictionaryScreen.Resource, "langCode");
ArrayList<String> codes = new ArrayList<String>();
final ArrayList<Language> languages = new ArrayList<Language>(ZLResource.languages());
//languages.remove(Language.SYSTEM_CODE);
//languages.add(0, Language.ANY_CODE);
for (Language l : ZLResource.languages()) {
if (!"system".equals(l.Code)) {
codes.add(l.Code);
}
}
Collections.sort(codes);
codes.add(0, Language.ANY_CODE);
String[] array = codes.toArray(new String[codes.size()]);
final ZLStringChoicePreference langCodePref = new ZLStringChoicePreference(this, dictionaryScreen.Resource, "langCode", DictionaryUtil.PreferredLanguageOption, array) {
final LanguagePreference langCodePref = new LanguagePreference(this, dictionaryScreen.Resource, "langCode", languages) {
@Override
protected void setList(String[] values) {
String[] texts = new String[values.length];
for (int i = 0; i < values.length; ++i) {
if (Language.ANY_CODE.equals(values[i])) {
texts[i] = ZLResource.resource("language-self").getResource("all").getValue();
} else {
final ZLResource resource = ZLResource.resource("language-self").getResource(values[i]);
texts[i] = resource.hasValue() ? resource.getValue() : values[i];
Log.d("WTF", values[i]);
Log.d("WTF", texts[i]);
}
}
setLists(values, texts);
protected void init() {
setInitialValue(DictionaryUtil.PreferredLanguageOption.getValue());
}
@Override
protected void setLanguage(String code) {
DictionaryUtil.PreferredLanguageOption.setValue(code);
}
};