Merge branch 'master' into pnt

wikimedia · Oct 1, 2024 · 9dc0e89 · 9dc0e89
2 parents 93a7f2f + 43b8234
commit 9dc0e89
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 0 deletions.
diff --git a/rules/ach/ach-tilde.js b/rules/ach/ach-tilde.js
@@ -0,0 +1,22 @@
+( function ( $ ) {
+	'use strict';
+
+	var achTilde = {
+		id: 'ach-tilde',
+		name: 'ach-tilde',
+		description: 'Acholi tilde keyboard',
+		date: '2024-09-30',
+		URL: 'https://github.com/wikimedia/jquery.ime',
+		author: 'Amir E. Aharoni',
+		license: 'GPLv3',
+		version: '1.0',
+		patterns: [
+			[ '~N', 'Ŋ' ],
+			[ '~n', 'ŋ' ],
+			[ '~/', '\u0301' ], // Combining acute
+			[ '~\\\\', '\u0300' ] // Combining grave
+		]
+	};
+
+	$.ime.register( achTilde );
+}( jQuery ) );
diff --git a/rules/laj/laj-tilde.js b/rules/laj/laj-tilde.js
@@ -0,0 +1,29 @@
+( function ( $ ) {
+	'use strict';
+
+	var lajTilde = {
+		id: 'laj-tilde',
+		name: 'Lango tilde',
+		description: 'Lango tilde',
+		date: '2024-09-30',
+		URL: 'https://github.com/wikimedia/jquery.ime',
+		author: 'Amir E. Aharoni',
+		license: 'GPLv3',
+		version: '1.0',
+		maxKeyLength: 2,
+		patterns: [
+			[ '~E', 'Ë' ],
+			[ '~e', 'ë' ],
+			[ '~I', 'Ï' ],
+			[ '~i', 'ï' ],
+			[ '~N', 'Ŋ' ],
+			[ '~n', 'ŋ' ],
+			[ '~O', 'Ö' ],
+			[ '~o', 'ö' ],
+			[ '~U', 'Ü' ],
+			[ '~u', 'ü' ]
+		]
+	};
+
+	$.ime.register( lajTilde );
+}( jQuery ) );
diff --git a/src/jquery.ime.inputmethods.js b/src/jquery.ime.inputmethods.js
@@ -4,6 +4,10 @@
 	// All keys have quotes for consistency
 	/* eslint-disable quote-props */
 	$.extend( $.ime.sources, {
+		'ach-tilde': {
+			name: 'Acholi tilde',
+			source: 'rules/ach/ach-tilde.js'
+		},
 		'af-tilde': {
 			name: 'Afrikaans tilde',
 			source: 'rules/af/af-tilde.js'
@@ -544,6 +548,10 @@
 			name: 'Kusaal tilde',
 			source: 'rules/kus/kus-tilde.js'
 		},
+		'laj-tilde': {
+			name: 'Lango tilde',
+			source: 'rules/laj/laj-tilde.js'
+		},
 		'lg-tilde': {
 			name: 'Luganda tilde',
 			source: 'rules/lg/lg-tilde.js'
@@ -1026,6 +1034,10 @@
 			autonym: 'Abron',
 			inputmethods: [ 'ak-qx', 'ak-tilde' ]
 		},
+		ach: {
+			autonym: 'Acoli',
+			inputmethods: [ 'ach-tilde' ]
+		},
 		ady: {
 			autonym: 'адыгэбзэ',
 			inputmethods: [ 'cyrl-palochka' ]
@@ -1414,6 +1426,10 @@
 			autonym: 'Kʋsaal',
 			inputmethods: [ 'kus-tilde' ]
 		},
+		laj: {
+			autonym: 'Lëblaŋo',
+			inputmethods: [ 'laj-tilde' ]
+		},
 		lbe: {
 			autonym: 'лакку',
 			inputmethods: [ 'cyrl-palochka' ]

diff --git a/test/jquery.ime.test.fixtures.js b/test/jquery.ime.test.fixtures.js
@@ -11,6 +11,13 @@ var palochkaVariants = {
 	},
 	// eslint-disable-next-line no-implicit-globals
 	testFixtures = [ // eslint-disable-line no-unused-vars
+	{
+		description: 'Acholi tilde test',
+		inputmethod: 'ach-tilde',
+		tests: [
+			{ input: '~N~na~\\e~/', output: 'Ŋŋàé', description: 'Acholi tilde Ŋŋà' }
+		]
+	},
 	{
 		description: 'Aja tilde test',
 		inputmethod: 'ajg-tilde',
@@ -4093,6 +4100,13 @@ var palochkaVariants = {
 			{ input: 'У', output: 'У', description: 'Kyrgyz Cyrillic letters, У does not change' }
 		]
 	},
+	{
+		description: 'Lango tilde test',
+		inputmethod: 'laj-tilde',
+		tests: [
+			{ input: '~e~i~n~o~u~E~I~N~O~U', output: 'ëïŋöüËÏŊÖÜ', description: 'Lango tilde test ëïŋöüËÏŊÖÜ' }
+		]
+	},
 	{
 		description: 'Luganda tilde test',
 		inputmethod: 'lg-tilde',