Skip to content

Commit a42e866

Browse files
Merge pull request openboard-team#664 from openboard-team/fix-german-eszett
[Fix] Added capital eszett and fixed default order in more keys
2 parents 0caec06 + 051c24d commit a42e866

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,9 +1139,10 @@ public static String[] getTextsTable(final Locale locale) {
11391139
/* morekeys_c */ null,
11401140
/* double_quotes */ "!text/double_9qm_lqm",
11411141
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
1142+
// U+1E9E: "ẞ" LATIN CAPITAL LETTER SHARP S
11421143
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
11431144
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
1144-
/* morekeys_s */ "\u00DF,\u015B,\u0161",
1145+
/* morekeys_s */ "\u00DF,%,\u1E9E,\u015B,\u0161",
11451146
/* single_quotes */ "!text/single_9qm_lqm",
11461147
/* keyspec_currency ~ */
11471148
null, null, null, null, null, null, null,
@@ -1207,9 +1208,10 @@ public static String[] getTextsTable(final Locale locale) {
12071208
/* morekeys_c */ null,
12081209
/* double_quotes */ "!text/double_9qm_lqm",
12091210
// U+00DF: "ß" LATIN SMALL LETTER SHARP S
1211+
// U+1E9E: "ẞ" LATIN CAPITAL LETTER SHARP S
12101212
// U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
12111213
// U+0161: "š" LATIN SMALL LETTER S WITH CARON
1212-
/* morekeys_s */ "\u00DF,%,\u015B,\u0161",
1214+
/* morekeys_s */ "\u00DF,%,\u1E9E,\u015B,\u0161",
12131215
/* single_quotes */ "!text/single_9qm_lqm",
12141216
/* keyspec_currency ~ */
12151217
null, null, null, null, null, null, null,

tools/make-keyboard-text/src/main/resources/values-de-rDE/donottranslate-more-keys.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
3232
<string name="morekeys_u">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
3333
<!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
34+
U+1E9E: "ẞ" LATIN CAPITAL LETTER SHARP S
3435
U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
3536
U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
36-
<string name="morekeys_s">&#x00DF;,%,&#x015B;,&#x0161;</string>
37+
<string name="morekeys_s">&#x00DF;,%,&#x1E9E;,&#x015B;,&#x0161;</string>
3738
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
3839
U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
3940
<string name="morekeys_n">&#x00F1;,&#x0144;</string>

tools/make-keyboard-text/src/main/resources/values-de/donottranslate-more-keys.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@
4949
U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->
5050
<string name="morekeys_u">&#x00FC;,%,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>
5151
<!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S
52+
U+1E9E: "ẞ" LATIN CAPITAL LETTER SHARP S
5253
U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
5354
U+0161: "š" LATIN SMALL LETTER S WITH CARON -->
54-
<string name="morekeys_s">&#x00DF;,&#x015B;,&#x0161;</string>
55+
<string name="morekeys_s">&#x00DF;,%,&#x1E9E;,&#x015B;,&#x0161;</string>
5556
<!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
5657
U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE -->
5758
<string name="morekeys_n">&#x00F1;,&#x0144;</string>

0 commit comments

Comments
 (0)