am 0f47d516: Merge "Reword "No language"" (f7959a3a) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values/strings.xml

+77 −14

Original line number	Diff line number	Diff line
		@@ -380,20 +380,83 @@
		This should be identical to subtype_serbian_latin aside from the trailing (%s).
		<string name="subtype_with_layout_sr-Latn">Serbian (Latin) (<xliff:g id="layout">%s</xliff:g>)</string>
		-->
		<!-- Description for language agnostic keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language">No language</string>
		<!-- Description for language agnostic QWERTY keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language_qwerty">No language (QWERTY)</string>
		<!-- Description for language agnostic QWERTZ keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language_qwertz">No language (QWERTZ)</string>
		<!-- Description for language agnostic AZERTY keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language_azerty">No language (AZERTY)</string>
		<!-- Description for language agnostic Dvorak keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language_dvorak">No language (Dvorak)</string>
		<!-- Description for language agnostic Colemak keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language_colemak">No language (Colemak)</string>
		<!-- Description for language agnostic PC QWERTY keyboard subtype [CHAR LIMIT=25] -->
		<string name="subtype_no_language_pcqwerty">No language (PC)</string>
		<!-- This string is displayed in a language list that allows to choose a language for
		suggestions in a software keyboard. This setting won't give suggestions in any particular
		language, hence "No language".
		As for the "alphabet" mention, it refers specifically to the Latin alphabet, as opposed to
		Cyrillic, Arabic, Hebrew or other scripts. This keyboard offers no suggestions, but it will
		be a QWERTY, or AZERTY, or any other disposition that only offers Latin characters, so
		you wouldn't be able to type, say, Arabic on it. Please translate it in a way that "alphabet"
		would be understood to mean specifically the Latin alphabet, rather than any other
		alphabet. [CHAR LIMIT=25] -->
		<string name="subtype_no_language">No language (Alphabet)</string>
		<!-- This string is displayed in the description for a keyboard type. It refers specifically to
		the Latin alphabet, as opposed to Cyrillic, Arabic, Hebrew or other scripts.
		When the device is configured to use a language using a script other than the Latin alphabet, the
		user still needs a keyboard that can input Latin characters for passwords or login names for
		example, and a way to switch to this Latin alphabet keyboard. This string is the description for
		this keyboard, so users of other scripts should understand when they read this that it represents a
		keyboard that is meant for them to be able to enter Latin characters as opposed to the script they
		are used to. This keyboard does not provide a dictionary, and it is not tied to any specific
		language among those that use the Latin alphabet. This keyboard is laid out in the QWERTY
		disposition rather than other common dispositions for Latin languages. [CHAR LIMIT=25] -->
		<string name="subtype_no_language_qwerty">Alphabet (QWERTY)</string>
		<!-- This string is displayed in the description for a keyboard type. It refers specifically to
		the Latin alphabet, as opposed to Cyrillic, Arabic, Hebrew or other scripts.
		When the device is configured to use a language using a script other than the Latin alphabet, the
		user still needs a keyboard that can input Latin characters for passwords or login names for
		example, and a way to switch to this Latin alphabet keyboard. This string is the description for
		this keyboard, so users of other scripts should understand when they read this that it represents a
		keyboard that is meant for them to be able to enter Latin characters as opposed to the script they
		are used to. This keyboard does not provide a dictionary, and it is not tied to any specific
		language among those that use the Latin alphabet. This keyboard is laid out in the QWERTZ
		disposition rather than other common dispositions for Latin languages. [CHAR LIMIT=25] -->
		<string name="subtype_no_language_qwertz">Alphabet (QWERTZ)</string>
		<!-- This string is displayed in the description for a keyboard type. It refers specifically to
		the Latin alphabet, as opposed to Cyrillic, Arabic, Hebrew or other scripts.
		When the device is configured to use a language using a script other than the Latin alphabet, the
		user still needs a keyboard that can input Latin characters for passwords or login names for
		example, and a way to switch to this Latin alphabet keyboard. This string is the description for
		this keyboard, so users of other scripts should understand when they read this that it represents a
		keyboard that is meant for them to be able to enter Latin characters as opposed to the script they
		are used to. This keyboard does not provide a dictionary, and it is not tied to any specific
		language among those that use the Latin alphabet. This keyboard is laid out in the AZERTY
		disposition rather than other common dispositions for Latin languages. [CHAR LIMIT=25] -->
		<string name="subtype_no_language_azerty">Alphabet (AZERTY)</string>
		<!-- This string is displayed in the description for a keyboard type. It refers specifically to
		the Latin alphabet, as opposed to Cyrillic, Arabic, Hebrew or other scripts.
		When the device is configured to use a language using a script other than the Latin alphabet, the
		user still needs a keyboard that can input Latin characters for passwords or login names for
		example, and a way to switch to this Latin alphabet keyboard. This string is the description for
		this keyboard, so users of other scripts should understand when they read this that it represents a
		keyboard that is meant for them to be able to enter Latin characters as opposed to the script they
		are used to. This keyboard does not provide a dictionary, and it is not tied to any specific
		language among those that use the Latin alphabet. This keyboard is laid out in the Dvorak
		disposition rather than other common dispositions for Latin languages. [CHAR LIMIT=25] -->
		<string name="subtype_no_language_dvorak">Alphabet (Dvorak)</string>
		<!-- This string is displayed in the description for a keyboard type. It refers specifically to
		the Latin alphabet, as opposed to Cyrillic, Arabic, Hebrew or other scripts.
		When the device is configured to use a language using a script other than the Latin alphabet, the
		user still needs a keyboard that can input Latin characters for passwords or login names for
		example, and a way to switch to this Latin alphabet keyboard. This string is the description for
		this keyboard, so users of other scripts should understand when they read this that it represents a
		keyboard that is meant for them to be able to enter Latin characters as opposed to the script they
		are used to. This keyboard does not provide a dictionary, and it is not tied to any specific
		language among those that use the Latin alphabet. This keyboard is laid out in the Colemak
		disposition rather than other common dispositions for Latin languages. [CHAR LIMIT=25] -->
		<string name="subtype_no_language_colemak">Alphabet (Colemak)</string>
		<!-- This string is displayed in the description for a keyboard type. It refers specifically to
		the Latin alphabet, as opposed to Cyrillic, Arabic, Hebrew or other scripts.
		When the device is configured to use a language using a script other than the Latin alphabet, the
		user still needs a keyboard that can input Latin characters for passwords or login names for
		example, and a way to switch to this Latin alphabet keyboard. This string is the description for
		this keyboard, so users of other scripts should understand when they read this that it represents a
		keyboard that is meant for them to be able to enter Latin characters as opposed to the script they
		are used to. This keyboard does not provide a dictionary, and it is not tied to any specific
		language among those that use the Latin alphabet. This keyboard is laid out in the QWERTY PC
		disposition that offers additional keys, but smaller keys compared to other common dispositions for
		mobile devices. [CHAR LIMIT=25] -->
		<string name="subtype_no_language_pcqwerty">Alphabet (PC)</string>

		<!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=35]-->
		<string name="custom_input_styles_title">Custom input styles</string>

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3151,7 +3151,7 @@ public final class KeyboardTextsSet {
		/* 7 */ "\u00E7",
		};

		/* Language zz: No language */
		/* Language zz: Alphabet */
		private static final String[] LANGUAGE_zz = {
		// U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
		// U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE
		@@ -3324,7 +3324,7 @@ public final class KeyboardTextsSet {
		"uk", LANGUAGE_uk, /* Ukrainian */
		"vi", LANGUAGE_vi, /* Vietnamese */
		"zu", LANGUAGE_zu, /* Zulu */
		"zz", LANGUAGE_zz, /* No language */
		"zz", LANGUAGE_zz, /* Alphabet */
		};

		static {

tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -126,13 +126,13 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase {
		// fr azerty F French
		// fr_CA qwerty F French (Canada)
		// de qwertz F German
		// zz qwerty F No language (QWERTY)
		// zz qwerty F Alphabet (QWERTY)
		// fr qwertz T French (QWERTZ)
		// de qwerty T German (QWERTY)
		// en_US azerty T English (US) (AZERTY) exception
		// en_UK dvorak T English (UK) (Dvorak) exception
		// es_US colemak T Spanish (US) (Colemak) exception
		// zz pc T No language (PC)
		// zz pc T Alphabet (PC)

		public void testPredefinedSubtypesInEnglishSystemLocale() {
		final RunInLocale<Void> tests = new RunInLocale<Void>() {
		@@ -150,7 +150,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase {
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(FR_CA));
		assertEquals("de ", "German",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(DE));
		assertEquals("zz ", "No language (QWERTY)",
		assertEquals("zz ", "Alphabet (QWERTY)",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ZZ));
		return null;
		}
		@@ -172,7 +172,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase {
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(EN_UK_DVORAK));
		assertEquals("es_US colemak","Spanish (US) (Colemak)",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ES_US_COLEMAK));
		assertEquals("zz azerty", "No language (PC)",
		assertEquals("zz pc", "Alphabet (PC)",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ZZ_PC));
		return null;
		}
		@@ -196,7 +196,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase {
		// en_US azerty T Anglais (États-Unis) (AZERTY) exception
		// en_UK dvorak T Anglais (Royaume-Uni) (Dvorak) exception
		// es_US colemak T Espagnol (États-Unis) (Colemak) exception
		// zz pc T Aucune langue (PC)
		// zz pc T Alphabet (PC)

		public void testPredefinedSubtypesInFrenchSystemLocale() {
		final RunInLocale<Void> tests = new RunInLocale<Void>() {
		@@ -214,7 +214,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase {
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(FR_CA));
		assertEquals("de ", "Allemand",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(DE));
		assertEquals("zz ", "Aucune langue (QWERTY)",
		assertEquals("zz ", "Alphabet (QWERTY)",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ZZ));
		return null;
		}
		@@ -236,7 +236,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase {
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(EN_UK_DVORAK));
		assertEquals("es_US colemak","Espagnol (États-Unis) (Colemak)",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ES_US_COLEMAK));
		assertEquals("zz azerty", "Aucune langue (PC)",
		assertEquals("zz pc", "Alphabet (PC)",
		SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ZZ_PC));
		return null;
		}

tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public class MoreKeysResources {
		private static final String EMPTY_STRING_VAR = "EMPTY";

		private static final String NO_LANGUAGE_CODE = "zz";
		private static final String NO_LANGUAGE_DISPLAY_NAME = "No language";
		private static final String NO_LANGUAGE_DISPLAY_NAME = "Alphabet";

		private final JarFile mJar;
		// Language to string resources map.