Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/80361
Change subject: Update from upstream ...................................................................... Update from upstream Change-Id: I904dfd1e089e92deaa2da50510d0975a8e317a94 --- M lib/jquery.ime/jquery.ime.js M lib/jquery.ime/rules/ckb/ckb-transliteration-arkbd.js M lib/jquery.ime/rules/ckb/ckb-transliteration-fakbd.js M lib/jquery.ime/rules/ckb/ckb-transliteration-lakbd.js M lib/jquery.ime/rules/hy/hy-emslegacy.js M lib/jquery.ime/rules/hy/hy-ephonetic.js M lib/jquery.ime/rules/hy/hy-ephoneticalt.js M lib/jquery.ime/rules/hy/hy-wmslegacy.js M lib/jquery.ime/rules/ku/ku-h.js M lib/jquery.ime/rules/ku/ku-tr.js M lib/jquery.ime/rules/or/or-transliteration.js M lib/jquery.ime/rules/pa/pa-phonetic.js M lib/jquery.ime/rules/te/te-transliteration.js M lib/jquery.ime/rules/udm/udm-alt.js M lib/jquery.ime/rules/ug/ug-kbd.js M lib/jquery.ime/rules/ur/ur-phonetic.js M lib/jquery.ime/rules/ur/ur-transliteration.js 17 files changed, 37 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/61/80361/1 diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js index d823850..d9547b2 100644 --- a/lib/jquery.ime/jquery.ime.js +++ b/lib/jquery.ime/jquery.ime.js @@ -1,11 +1,8 @@ -/*! jquery.ime - v0.1.0+20130820 +/*! jquery.ime - v0.1.0+20130822 * https://github.com/wikimedia/jquery.ime * Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */ -( function ( $ ) { +( function ( $, rangy ) { 'use strict'; - - // rangy is defined in the rangy library - /*global rangy */ /** * IME Class @@ -721,7 +718,7 @@ return index; } ); } -}( jQuery ) ); +}( jQuery, rangy ) ); ( function ( $ ) { 'use strict'; @@ -890,6 +887,7 @@ imeselector.$menu.on( 'click.ime', 'li.ime-lang', function () { var im = imeselector.selectLanguage( $( this ).attr( 'lang' ) ); + imeselector.$element.trigger( 'setim.ime', im ); return false; @@ -1096,7 +1094,7 @@ return $.ime.preferences.getLanguage(); } - if ( this.$element.attr('lang' ) && + if ( this.$element.attr( 'lang' ) && $.ime.languages[ this.$element.attr( 'lang' ) ] ) { return this.$element.attr( 'lang' ); @@ -1388,7 +1386,7 @@ $.extend( $.ime.preferences, { registry: { isDirty: false, - language : null, + language: null, previousLanguages: [], // array of previous languages previousInputMethods: [], // array of previous inputmethods imes: { @@ -1460,6 +1458,7 @@ if ( !this.registry.imes ) { this.registry.imes = {}; } + return this.registry.imes[language] || 'system'; }, @@ -1812,11 +1811,11 @@ source: 'rules/ks/ks-kbd.js' }, 'ku-h': { - name: 'Ku h', + name: 'Kurdî-h', source: 'rules/ku/ku-h.js' }, 'ku-tr': { - name: 'Ku tr', + name: 'Kurdî-tr', source: 'rules/ku/ku-tr.js' }, 'lo-kbd': { diff --git a/lib/jquery.ime/rules/ckb/ckb-transliteration-arkbd.js b/lib/jquery.ime/rules/ckb/ckb-transliteration-arkbd.js index b53a28e..77e98ea 100644 --- a/lib/jquery.ime/rules/ckb/ckb-transliteration-arkbd.js +++ b/lib/jquery.ime/rules/ckb/ckb-transliteration-arkbd.js @@ -98,6 +98,6 @@ ['\\?', '؟'] ] }; - $.ime.register( ckbTransliterationArkbd ); + $.ime.register( ckbTransliterationArkbd ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/ckb/ckb-transliteration-fakbd.js b/lib/jquery.ime/rules/ckb/ckb-transliteration-fakbd.js index 4dcd52a..01cf59d 100644 --- a/lib/jquery.ime/rules/ckb/ckb-transliteration-fakbd.js +++ b/lib/jquery.ime/rules/ckb/ckb-transliteration-fakbd.js @@ -99,6 +99,6 @@ ['\\?', '؟'] ] }; - $.ime.register( ckbTransliterationFakbd ); + $.ime.register( ckbTransliterationFakbd ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/ckb/ckb-transliteration-lakbd.js b/lib/jquery.ime/rules/ckb/ckb-transliteration-lakbd.js index 5b0016f..f5bea06 100644 --- a/lib/jquery.ime/rules/ckb/ckb-transliteration-lakbd.js +++ b/lib/jquery.ime/rules/ckb/ckb-transliteration-lakbd.js @@ -95,6 +95,6 @@ ['\\?', '؟'] ] }; - $.ime.register( ckbTransliterationLakbd ); + $.ime.register( ckbTransliterationLakbd ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/hy/hy-emslegacy.js b/lib/jquery.ime/rules/hy/hy-emslegacy.js index 725c2a4..7886f3b 100644 --- a/lib/jquery.ime/rules/hy/hy-emslegacy.js +++ b/lib/jquery.ime/rules/hy/hy-emslegacy.js @@ -1,7 +1,8 @@ /** - * Eastern Armenian phonetic layout introduced by Microsoft in Windows 2000 and depreceated in Windows 8. - * Original layout was created in late 90-ies based on Unicode 3, and was never updated since release, - * causing it to be incompatible with Unicode. + * Eastern Armenian phonetic layout introduced by Microsoft in Windows 2000 and depreceated + * in Windows 8. + * Original layout was created in late 90-ies based on Unicode 3, and was never updated + * since release, causing it to be incompatible with Unicode. * * This layout version complies with Unicode 6.1, including all valid Armenian punctuation signs, * mijaket (outside of main Armenian Unicode range) and Dram (AMD) sign under USD sign (Shift + 4). @@ -165,5 +166,4 @@ }; $.ime.register( hyEmslegacy ); - }( jQuery ) ); diff --git a/lib/jquery.ime/rules/hy/hy-ephonetic.js b/lib/jquery.ime/rules/hy/hy-ephonetic.js index 66f7039..9580ef7 100644 --- a/lib/jquery.ime/rules/hy/hy-ephonetic.js +++ b/lib/jquery.ime/rules/hy/hy-ephonetic.js @@ -1,6 +1,7 @@ /** * This is a phonetic layout for the Armenian language (hy, arm, hye). - * The layout comes from DOS times, and was later popularised by KDWin and WinKeys keyboard "drivers". + * The layout comes from DOS times, and was later popularised by KDWin and + * WinKeys keyboard "drivers". * While not as efficient and well-thought as the official typewriter layout, it is very popular as * it uses similary sounding Latin letters, which is very handy, as keyboards in Armenia * don't come engraved with Armenian letters. diff --git a/lib/jquery.ime/rules/hy/hy-ephoneticalt.js b/lib/jquery.ime/rules/hy/hy-ephoneticalt.js index c346648..0fb0ea4 100644 --- a/lib/jquery.ime/rules/hy/hy-ephoneticalt.js +++ b/lib/jquery.ime/rules/hy/hy-ephoneticalt.js @@ -1,6 +1,6 @@ /** - * This is alternative phonetic layout for Armenian language (hy, arm, hye). - * Based on Armenian phonetic layout, it improves few things, by placing ր under latin r, + * This is alternative phonetic layout for Armenian language (hy, arm, hye). + * Based on Armenian phonetic layout, it improves few things, by placing ր under latin r, * as ր is much more frequent in Armenian. ռ goes under 8, where ր is in standart phonetic. * Another change, which is not yet in xkb, ( as of July 2013), is swapping ֆ and թ: Ֆ is * placed under F, where left index finger is, but is the least used letter in Armenian, @@ -10,7 +10,7 @@ * mijaket (outside of main Armenian Unicode range) and Dram (AMD) sign. * Please, double-check with Unicode before making any changes here. * - * Layout supports extended keys, with AltGr (Alt or Alt+Ctrl on some systems) + key, + * Layout supports extended keys, with AltGr (Alt or Alt+Ctrl on some systems) + key, * producing digits and punctuation marks from standard US keyboard layout. */ @@ -168,5 +168,4 @@ }; $.ime.register( hyEphonetic ); - }( jQuery ) ); diff --git a/lib/jquery.ime/rules/hy/hy-wmslegacy.js b/lib/jquery.ime/rules/hy/hy-wmslegacy.js index 24efcea..bec1c09 100644 --- a/lib/jquery.ime/rules/hy/hy-wmslegacy.js +++ b/lib/jquery.ime/rules/hy/hy-wmslegacy.js @@ -1,12 +1,13 @@ /** - * Western Armenian phonetic layout introduced by Microsoft in Windows 2000 and depreceated in Windows 8. - * Original layout was created in late 90-ies based on Unicode 3, and was never updated since release, - * causing it to be incompatible with Unicode. + * Western Armenian phonetic layout introduced by Microsoft in Windows 2000 and depreceated + * in Windows 8. + * Original layout was created in late 90-ies based on Unicode 3, and was never updated + * since release, causing it to be incompatible with Unicode. * * This layout version complies with Unicode 6.1, including all valid Armenian punctuation signs, * mijaket (outside of main Armenian Unicode range) and Dram (AMD) sign under USD sign (Shift + 4). * Please, double-check with Unicode before making any changes here. - * + * * Layout supports extended keys, with AltGr (Alt or Alt+Ctrl on some systems) + key, * producing digits and punctuation marks from standard US keyboard layout. */ @@ -165,5 +166,4 @@ }; $.ime.register( hyWmslegacy ); - }( jQuery ) ); diff --git a/lib/jquery.ime/rules/ku/ku-h.js b/lib/jquery.ime/rules/ku/ku-h.js index f91b4a1..2757885 100644 --- a/lib/jquery.ime/rules/ku/ku-h.js +++ b/lib/jquery.ime/rules/ku/ku-h.js @@ -3,7 +3,7 @@ var kuH = { id: 'ku-h', - name: 'Ku h', + name: 'Kurdî-h', description: 'writing Kurdish-letters adding h\'s', date: '2013-06-26', URL: 'http://github.com/wikimedia/jquery.ime', @@ -44,5 +44,4 @@ }; $.ime.register( kuH ); - }( jQuery ) ); diff --git a/lib/jquery.ime/rules/ku/ku-tr.js b/lib/jquery.ime/rules/ku/ku-tr.js index d604bc9..5853df6 100644 --- a/lib/jquery.ime/rules/ku/ku-tr.js +++ b/lib/jquery.ime/rules/ku/ku-tr.js @@ -3,7 +3,7 @@ var kuTr = { id: 'ku-tr', - name: 'Ku tr', + name: 'Kurdî-tr', description: 'writing Kurdish-letters using the TR keyboard', date: '2013-06-26', URL: 'http://github.com/wikimedia/jquery.ime', @@ -29,5 +29,4 @@ }; $.ime.register( kuTr ); - }( jQuery ) ); diff --git a/lib/jquery.ime/rules/or/or-transliteration.js b/lib/jquery.ime/rules/or/or-transliteration.js index 866a59d..12fd8d9 100644 --- a/lib/jquery.ime/rules/or/or-transliteration.js +++ b/lib/jquery.ime/rules/or/or-transliteration.js @@ -4,7 +4,6 @@ var orTransliteration = { id: 'or-transliteration', name: 'ଟ୍ରାନ୍ସଲିଟରେସନ', - description: 'Odia Transliteration', date: '2012-10-14', URL: 'http://github.com/wikimedia/jquery.ime', diff --git a/lib/jquery.ime/rules/pa/pa-phonetic.js b/lib/jquery.ime/rules/pa/pa-phonetic.js index 9b1570e..4690c74 100644 --- a/lib/jquery.ime/rules/pa/pa-phonetic.js +++ b/lib/jquery.ime/rules/pa/pa-phonetic.js @@ -25,7 +25,7 @@ ['8', '8'], ['\\(', '੯'], ['9', '9'], - ['\\),', '੦'], + ['\\)', '੦'], ['0', '0'], ['Q', 'ਥ'], ['q', 'ਤ'], diff --git a/lib/jquery.ime/rules/te/te-transliteration.js b/lib/jquery.ime/rules/te/te-transliteration.js index 7fc547e..3f07cf0 100644 --- a/lib/jquery.ime/rules/te/te-transliteration.js +++ b/lib/jquery.ime/rules/te/te-transliteration.js @@ -216,5 +216,6 @@ ['//', 'ఽ'], // avagraha ['~\\$', '₹']] // rupee }; + $.ime.register( teTransliteration ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/udm/udm-alt.js b/lib/jquery.ime/rules/udm/udm-alt.js index cd33010..c7325eb 100644 --- a/lib/jquery.ime/rules/udm/udm-alt.js +++ b/lib/jquery.ime/rules/udm/udm-alt.js @@ -20,7 +20,6 @@ ['ф', 'ӝ'], ['Ф', 'Ӝ'] ], - patterns_x: [ ['ё', 'ӧ'], ['Ё', 'Ӧ'], @@ -36,5 +35,6 @@ ['Ф', 'Ф'] ] }; + $.ime.register( udmAlt ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/ug/ug-kbd.js b/lib/jquery.ime/rules/ug/ug-kbd.js index 9bcdaed..ac8acff 100644 --- a/lib/jquery.ime/rules/ug/ug-kbd.js +++ b/lib/jquery.ime/rules/ug/ug-kbd.js @@ -74,5 +74,6 @@ ['\\_', '\u2014'] ] }; + $.ime.register( ugKbd ); }( jQuery ) ); diff --git a/lib/jquery.ime/rules/ur/ur-phonetic.js b/lib/jquery.ime/rules/ur/ur-phonetic.js index 67dccb2..98b7596 100644 --- a/lib/jquery.ime/rules/ur/ur-phonetic.js +++ b/lib/jquery.ime/rules/ur/ur-phonetic.js @@ -46,7 +46,7 @@ ['u', 'ء'], ['I', 'ٰ'], ['i', 'ی'], - ['O', 'ۃ'], // Teh marbuta goal + /* Teh marbuta goal */ ['O', 'ۃ'], ['o', 'ہ'], ['P', 'ُ'], ['p', 'پ'], diff --git a/lib/jquery.ime/rules/ur/ur-transliteration.js b/lib/jquery.ime/rules/ur/ur-transliteration.js index 593a5f3..7b1236e 100644 --- a/lib/jquery.ime/rules/ur/ur-transliteration.js +++ b/lib/jquery.ime/rules/ur/ur-transliteration.js @@ -29,7 +29,7 @@ ['i', 'ب'], ['I', 'ـ'], ['U', 'ۃ'], - ['\\;', '؛'], + /* Arabic semicolon */ ['\\;', '؛'], ['\\:', ':'], ['p', 'ح'], ['P', 'خ'], @@ -49,7 +49,7 @@ ['y', 'پ'], ['Y', '\u0651\u00AD'], ['c', 'ے'], - ['\\?','؟'], + /* Arabic question mark */ ['\\?','؟'], ['j', 'ا'], ['n', 'غ'], ['N', 'ئ'], @@ -89,9 +89,10 @@ ['\\%', '','٪'], ['\\^', '','^'], ['\\&', 'ۖ'], - ['\\*', '٭'], + /* Arabic star */ ['\\*', '٭'], ['\\(', '('], ['\\)', ')']] }; + $.ime.register( urTransliteration ); }( jQuery ) ); -- To view, visit https://gerrit.wikimedia.org/r/80361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I904dfd1e089e92deaa2da50510d0975a8e317a94 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Amire80 <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
