diff --git a/java/res/values-en-rCL/donottranslate-altchars.xml b/java/res/values-en-rCL/donottranslate-altchars.xml new file mode 100644 index 000000000..50edbab97 --- /dev/null +++ b/java/res/values-en-rCL/donottranslate-altchars.xml @@ -0,0 +1,47 @@ + + + + áàâãäåāæ + + çč㢠+ đ + éèêëē€ + 3₣ + 5 + + íìîïī + 6 + + 7£₤λ + μ + ñ + óòôõöōø + 4π₱ + 1 + + §ßš + + 8úùûüū + + 2 + + 9ýÿ¥ + ž + diff --git a/java/res/values-en-rCL/donottranslate-keymap.xml b/java/res/values-en-rCL/donottranslate-keymap.xml new file mode 100644 index 000000000..9a01e697e --- /dev/null +++ b/java/res/values-en-rCL/donottranslate-keymap.xml @@ -0,0 +1,224 @@ + + + + ` + ~ + `~ + + 1 + ! + 1!¡¹½⅓¼⅛ + + 2 + \@ + 2\@²⅔ + + 3 + # + 3#³¾⅜♥♠♦♣ + + 4 + $ + 4$⁴¢£€¥ + + 5 + % + 5%⅝‰ + + 6 + ^ + 6^↑↓←→ + + 7 + & + 7&⅞♪ + + 8 + * + 8*•★∞†‡ + + 9 + ( + 9(√ + + 0 + ) + 0)ⁿ° + + - + _ + -_—– + + = + + + =+≈≠±×÷ + + + q + Q + @string/alternates_for_q + + w + W + @string/alternates_for_w + + f + F + @string/alternates_for_f + + p + P + @string/alternates_for_p + + g + G + @string/alternates_for_g + + j + J + @string/alternates_for_j + + l + L + @string/alternates_for_l + + u + U + @string/alternates_for_u + + y + Y + @string/alternates_for_y + + ; + : + 0;: + + [ + { + [{ + + ] + } + ]} + + \\ + | + \\| + + + a + A + @string/alternates_for_a + + r + R + @string/alternates_for_r + + s + S + @string/alternates_for_s + + t + T + @string/alternates_for_t + + d + D + @string/alternates_for_d + + h + H + @string/alternates_for_h + + n + N + @string/alternates_for_n + + e + E + @string/alternates_for_e + + i + I + @string/alternates_for_i + + o + O + @string/alternates_for_o + + \' + \" + \'\"‘’“” + + + + + + + z + Z + @string/alternates_for_z + + x + X + @string/alternates_for_x + + c + C + @string/alternates_for_c + + v + V + @string/alternates_for_v + + b + B + @string/alternates_for_b + + k + K + @string/alternates_for_k + + m + M + @string/alternates_for_m + + , + < + ,<≤«‹ + + . + > + >≥»›… + + / + \? + /\?¿ + + diff --git a/java/res/values-en-rCL/kbd_qwerty.xml b/java/res/values-en-rCL/kbd_qwerty.xml new file mode 100644 index 000000000..712a57d06 --- /dev/null +++ b/java/res/values-en-rCL/kbd_qwerty.xml @@ -0,0 +1,538 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java index dfa361090..65009615a 100644 --- a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java +++ b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java @@ -1,12 +1,12 @@ /* * Copyright (C) 2008-2009 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -69,7 +69,7 @@ public class InputLanguageSelection extends PreferenceActivity { // the available keyboard resources and dictionaries. private static final String[] KBD_LOCALIZATIONS = { "ar", "bg", "bg_ST", "ca", "cs", "cs_QY", "da", "de", "de_NE", - "el", "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "es_US", + "el", "en", "en_CL", "en_CX", "en_DV", "en_GB", "es", "es_LA", "es_US", "fa", "fi", "fr", "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "in", "it", "iw", "ja", "ka", "ko", "lo", "lt", "lv", "nb", "nl", "pl", "pt", "pt_PT", "rm", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl", @@ -78,7 +78,7 @@ public class InputLanguageSelection extends PreferenceActivity { private static final String[] KBD_5_ROW = { "ar", "bg", "bg_ST", "cs", "cs_QY", "da", "de", "de_NE", "el", - "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "fa", "fi", "fr", + "en", "en_CL", "en_CX", "en_DV", "en_GB", "es", "es_LA", "fa", "fi", "fr", "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "it", "iw", "lo", "lt", "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl", "sr", "sv", "ta", "th", "tr", "uk" @@ -86,7 +86,7 @@ public class InputLanguageSelection extends PreferenceActivity { private static final String[] KBD_4_ROW = { "ar", "bg", "bg_ST", "cs", "cs_QY", "da", "de", "de_NE", "el", - "en", "en_CX", "en_DV", "es", "es_LA", "es_US", "fa", "fr", "fr_CA", + "en", "en_CL", "en_CX", "en_DV", "es", "es_LA", "es_US", "fa", "fr", "fr_CA", "he", "hr", "hu", "hu_QY", "iw", "nb", "ru", "ru_PH", "sk", "sk_QY", "sl", "sr", "sv", "tr", "uk" }; @@ -98,8 +98,10 @@ private static String getLocaleName(Locale l) { return "English (Dvorak)"; } else if (lang.equals("en") && country.equals("EX")) { return "English (4x11)"; + } else if (lang.equals("en") && country.equals("CL")) { + return "English (Colemak)"; } else if (lang.equals("en") && country.equals("CX")) { - return "English (Carpalx)"; + return "English (Carpalx)"; } else if (lang.equals("es") && country.equals("LA")) { return "Español (Latinoamérica)"; } else if (lang.equals("cs") && country.equals("QY")) { @@ -122,7 +124,7 @@ private static String getLocaleName(Locale l) { return LanguageSwitcher.toTitleCase(l.getDisplayName(l)); } } - + private static class Loc implements Comparable { static Collator sCollator = Collator.getInstance(); @@ -153,7 +155,7 @@ protected void onCreate(Bundle icicle) { String selectedLanguagePref = sp.getString(LatinIME.PREF_SELECTED_LANGUAGES, ""); Log.i(TAG, "selected languages: " + selectedLanguagePref); String[] languageList = selectedLanguagePref.split(","); - + mAvailableLanguages = getUniqueLocales(); // Compatibility hack for v1.22 and older - if a selected language 5-code isn't @@ -188,8 +190,8 @@ protected void onCreate(Bundle icicle) { boolean has4Row = arrayContains(KBD_4_ROW, fivecode) || arrayContains(KBD_4_ROW, language); boolean has5Row = arrayContains(KBD_5_ROW, fivecode) || arrayContains(KBD_5_ROW, language); List summaries = new ArrayList(3); - if (has5Row) summaries.add("5-row"); - if (has4Row) summaries.add("4-row"); + if (has5Row) summaries.add("5-row"); + if (has4Row) summaries.add("4-row"); if (hasDictionary(locale)) { summaries.add(getResources().getString(R.string.has_dictionary)); } @@ -280,13 +282,13 @@ private static String asString(Set set) { out.append(")"); return out.toString(); } - + ArrayList getUniqueLocales() { Set localeSet = new HashSet(); Set langSet = new HashSet(); // Ignore the system (asset) locale list, it's inconsistent and incomplete // String[] sysLocales = getAssets().getLocales(); -// +// // // First, add zz_ZZ style full language+country locales // for (int i = 0; i < sysLocales.length; ++i) { // String sl = sysLocales[i]; @@ -294,7 +296,7 @@ ArrayList getUniqueLocales() { // localeSet.add(sl); // langSet.add(sl.substring(0, 2)); // } -// +// // // Add entries for system languages without country, but only if there's // // no full locale for that language yet. // for (int i = 0; i < sysLocales.length; ++i) { @@ -302,7 +304,7 @@ ArrayList getUniqueLocales() { // if (sl.length() != 2 || langSet.contains(sl)) continue; // localeSet.add(sl); // } - + // Add entries for additional languages supported by the keyboard. for (int i = 0; i < KBD_LOCALIZATIONS.length; ++i) { String kl = KBD_LOCALIZATIONS[i]; @@ -318,7 +320,7 @@ ArrayList getUniqueLocales() { String[] locales = new String[localeSet.size()]; locales = localeSet.toArray(locales); Arrays.sort(locales); - + ArrayList uniqueLocales = new ArrayList(); final int origSize = locales.length; @@ -338,9 +340,9 @@ ArrayList getUniqueLocales() { // zz_rYY l = new Locale(language, s.substring(4, 6)); } else { - l = new Locale(language); + l = new Locale(language); } - + // Exclude languages that are not relevant to LatinIME if (arrayContains(BLACKLIST_LANGUAGES, language)) continue;