From 5ed3c445121a363b9f47b2fa108485bd1d7584d4 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Mon, 13 Jun 2022 10:28:21 +0300 Subject: [PATCH] Update jquery.ime and jquery.uls from upstream ime: * Add keyboards for Bura (bwr) and Kanuri (kr) * Change internal names for mul-cm and mul-bf. Updating to https://github.com/wikimedia/jquery.ime/commit/c2086d2a83aea800bd8fc347dd555be93d0c8682 uls: * For language links, use full space in
  • elements (resolves bug T308688) * language-data update: add bwr and kr, change kr autonym, remove tg-cyrl from Pakistan. Updating to: https://github.com/wikimedia/jquery.uls/commit/958475618789e420a9b52ca03a75d538075c83a0 Bug: T308688 Change-Id: I58badc067e9789173103378f7eaf38189315df70 --- lib/jquery.ime/jquery.ime.js | 18 +++++++++++++++++- lib/jquery.ime/rules/bwr/bwr-tilde.js | 25 +++++++++++++++++++++++++ lib/jquery.ime/rules/kr/kr-tilde.js | 27 +++++++++++++++++++++++++++ lib/jquery.ime/rules/mul-bf/mul-bf.js | 2 +- lib/jquery.ime/rules/mul-cm/mul-cm.js | 2 +- lib/jquery.uls/css/jquery.uls.lcd.css | 4 ++-- lib/jquery.uls/src/jquery.uls.data.js | 14 ++++++++++---- 7 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 lib/jquery.ime/rules/bwr/bwr-tilde.js create mode 100644 lib/jquery.ime/rules/kr/kr-tilde.js diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index 48ddd75d..4e214a84 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,4 +1,4 @@ -/*! jquery.ime - v0.2.0+20220606 +/*! jquery.ime - v0.2.0+20220613 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2022 Santhosh Thottingal; License: (GPL-2.0-or-later OR MIT) */ ( function ( $ ) { @@ -1778,6 +1778,10 @@ name: 'इनस्क्रिप्ट २', source: 'rules/brx/brx-inscript2.js' }, + 'bwr-tilde': { + name: 'Bura ', + source: 'rules/bwr/bwr-tilde.js' + }, 'byn-geezim': { name: 'ብሊን', source: 'rules/byn/byn-geezim.js' @@ -2070,6 +2074,10 @@ name: 'ಲಿಪ್ಯಂತರಣ', source: 'rules/kn/kn-transliteration.js' }, + 'kr-tilde': { + name: 'Kanuri tilde', + source: 'rules/kr/kr-tilde.js' + }, 'ky-cyrl-alt': { name: 'Кыргыз Alt', source: 'rules/ky/ky-cyrl-alt.js' @@ -2636,6 +2644,10 @@ autonym: 'bulu', inputmethods: [ 'mul-cm' ] }, + bwr: { + autonym: 'bura', + inputmethods: [ 'bwr-tilde' ] + }, byn: { autonym: 'ብሊን', inputmethods: [ 'byn-geezim' ] @@ -2832,6 +2844,10 @@ autonym: 'ಕನ್ನಡ', inputmethods: [ 'kn-transliteration', 'kn-inscript', 'kn-kgp', 'kn-inscript2' ] }, + kr: { + autonym: 'kanuri', + inputmethods: [ 'kr-tilde' ] + }, ks: { autonym: 'कॉशुर / کٲشُر', inputmethods: [ 'ks-inscript', 'ks-kbd' ] diff --git a/lib/jquery.ime/rules/bwr/bwr-tilde.js b/lib/jquery.ime/rules/bwr/bwr-tilde.js new file mode 100644 index 00000000..1d8911c6 --- /dev/null +++ b/lib/jquery.ime/rules/bwr/bwr-tilde.js @@ -0,0 +1,25 @@ +( function ( $ ) { + 'use strict'; + + var bwrTilde = { + id: 'bwr-tilde', + name: 'Bura tilde', + description: 'Bura tilde keyboard', + date: '2022-06-11', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 2, + patterns: [ + [ '~B', 'Ɓ' ], + [ '~b', 'ɓ' ], + [ '~D', 'Ɗ' ], + [ '~d', 'ɗ' ], + [ '~E', 'Ə' ], + [ '~e', 'ə' ] + ] + }; + + $.ime.register( bwrTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/kr/kr-tilde.js b/lib/jquery.ime/rules/kr/kr-tilde.js new file mode 100644 index 00000000..541d8212 --- /dev/null +++ b/lib/jquery.ime/rules/kr/kr-tilde.js @@ -0,0 +1,27 @@ +( function ( $ ) { + 'use strict'; + + var krTilde = { + id: 'kr-tilde', + name: 'Kanuri tilde', + description: 'Kanuri tilde keyboard', + date: '2022-06-11', + URL: 'https://github.com/wikimedia/jquery.ime', + author: 'Amir E. Aharoni', + license: 'GPLv3', + version: '1.0', + maxKeyLength: 2, + patterns: [ + [ '~E', 'Ǝ' ], + [ '~e', 'ǝ' ], + [ '~R', 'Ɍ' ], + [ '~r', 'ɍ' ], + [ '~\\\\', '\u0300' ], // Combining grave accent + [ '~/', '\u0301' ], // Combining acute accent + [ '~\\^', '\u0302' ], // Combining circumflex accent + [ '~v', '\u030C' ] // Combining caron + ] + }; + + $.ime.register( krTilde ); +}( jQuery ) ); diff --git a/lib/jquery.ime/rules/mul-bf/mul-bf.js b/lib/jquery.ime/rules/mul-bf/mul-bf.js index 12f84262..f0928ce1 100644 --- a/lib/jquery.ime/rules/mul-bf/mul-bf.js +++ b/lib/jquery.ime/rules/mul-bf/mul-bf.js @@ -3,7 +3,7 @@ var mulBf = { id: 'mul-bf', - name: 'mul-bf', + name: 'Burkina Faso tilde', description: 'Burkina Faso tilde keyboard', date: '2022-02-14', URL: 'https://github.com/wikimedia/jquery.ime', diff --git a/lib/jquery.ime/rules/mul-cm/mul-cm.js b/lib/jquery.ime/rules/mul-cm/mul-cm.js index 29a6e116..186ba668 100644 --- a/lib/jquery.ime/rules/mul-cm/mul-cm.js +++ b/lib/jquery.ime/rules/mul-cm/mul-cm.js @@ -3,7 +3,7 @@ var mulCm = { id: 'mul-cm', - name: 'mul-cm', + name: 'Cameroon Languages tilde', description: 'General Alphabet of Cameroon Languages tilde keyboard', date: '2022-02-07', URL: 'https://github.com/wikimedia/jquery.ime', diff --git a/lib/jquery.uls/css/jquery.uls.lcd.css b/lib/jquery.uls/css/jquery.uls.lcd.css index b10334b6..4b04e139 100644 --- a/lib/jquery.uls/css/jquery.uls.lcd.css +++ b/lib/jquery.uls/css/jquery.uls.lcd.css @@ -68,9 +68,8 @@ } .uls-language-block > ul > li { - cursor: pointer; margin-left: 20px; - padding: 8px; + padding: 0; /* * The directionality (ltr/rtl) for each list item is set dynamically * as HTML attributes in JavaScript. Setting directionality also applies @@ -95,6 +94,7 @@ display: inline-block; width: 100%; overflow-x: hidden; + padding: 8px; /* * Some languages have long names for various reasons and we still want * them to appear on one line. diff --git a/lib/jquery.uls/src/jquery.uls.data.js b/lib/jquery.uls/src/jquery.uls.data.js index edc26859..20d9d3a3 100644 --- a/lib/jquery.uls/src/jquery.uls.data.js +++ b/lib/jquery.uls/src/jquery.uls.data.js @@ -667,6 +667,13 @@ ], "bulu" ], + "bwr": [ + "Latn", + [ + "AF" + ], + "bura" + ], "bxr": [ "Cyrl", [ @@ -2139,7 +2146,7 @@ [ "AF" ], - "Kanuri" + "kanuri" ], "krc": [ "Cyrl", @@ -5904,10 +5911,9 @@ "brh", "fa", "bgn", - "tg-cyrl", "bft", - "khw", - "ks-arab" + "ks-arab", + "khw" ], "PL": [ "pl",