From 6f0c732ea193c996e1a3087e3ee932a65e7973c4 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Mon, 19 Nov 2012 19:33:31 +0100 Subject: [PATCH] Lint: Pass mediawiki.language. Maybe they'll get closures soon, but for now just fix the warnings so we can get on with enforcing jshint from jenkins like we do phplint/puppetlint. Added tolerance for "onecase" and disabled "noempty" in a few files. Keeps these files easier to update. Though they should be restructured, I'm not going to do that now. Change-Id: Ie3535f22fc88ea5272d7387cef870c8c042a9393 --- resources/mediawiki.language/languages/bs.js | 6 ++-- resources/mediawiki.language/languages/dsb.js | 6 ++-- resources/mediawiki.language/languages/fi.js | 15 ++++++---- resources/mediawiki.language/languages/ga.js | 7 +++-- resources/mediawiki.language/languages/he.js | 14 ++++----- resources/mediawiki.language/languages/hsb.js | 6 ++-- resources/mediawiki.language/languages/hu.js | 6 ++-- resources/mediawiki.language/languages/hy.js | 16 +++++----- resources/mediawiki.language/languages/la.js | 6 ++-- resources/mediawiki.language/languages/os.js | 29 ++++++++++--------- resources/mediawiki.language/languages/ru.js | 23 ++++++++------- resources/mediawiki.language/languages/sl.js | 6 ++-- resources/mediawiki.language/languages/uk.js | 28 +++++++++--------- 13 files changed, 89 insertions(+), 79 deletions(-) diff --git a/resources/mediawiki.language/languages/bs.js b/resources/mediawiki.language/languages/bs.js index c0c77aaf95..65eb5a6da7 100644 --- a/resources/mediawiki.language/languages/bs.js +++ b/resources/mediawiki.language/languages/bs.js @@ -2,10 +2,10 @@ * Bosnian (bosanski) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'bs', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms = mediaWiki.language.getData( 'bs', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'instrumental': // instrumental diff --git a/resources/mediawiki.language/languages/dsb.js b/resources/mediawiki.language/languages/dsb.js index a42a8f7f42..b2c9c081f3 100644 --- a/resources/mediawiki.language/languages/dsb.js +++ b/resources/mediawiki.language/languages/dsb.js @@ -2,10 +2,10 @@ * Lower Sorbian (Dolnoserbski) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'dsb', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms = mediaWiki.language.getData( 'dsb', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'instrumental': // instrumental diff --git a/resources/mediawiki.language/languages/fi.js b/resources/mediawiki.language/languages/fi.js index 374698dc79..61c6c104e1 100644 --- a/resources/mediawiki.language/languages/fi.js +++ b/resources/mediawiki.language/languages/fi.js @@ -3,21 +3,24 @@ * @author Santhosh Thottingal */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'fi', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms, aou, origWord; + + grammarForms = mediaWiki.language.getData( 'fi', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } // vowel harmony flag - var aou = word.match( /[aou][^äöy]*$/i ); - var origWord = word; + aou = word.match( /[aou][^äöy]*$/i ); + origWord = word; if ( word.match( /wiki$/i ) ) { aou = false; } //append i after final consonant - if ( word.match( /[bcdfghjklmnpqrstvwxz]$/i ) ) + if ( word.match( /[bcdfghjklmnpqrstvwxz]$/i ) ) { word += 'i'; + } switch ( form ) { case 'genitive': diff --git a/resources/mediawiki.language/languages/ga.js b/resources/mediawiki.language/languages/ga.js index a27b489d50..c13e8321c4 100644 --- a/resources/mediawiki.language/languages/ga.js +++ b/resources/mediawiki.language/languages/ga.js @@ -2,10 +2,11 @@ * Irish (Gaeilge) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'ga', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + /*jshint onecase:true */ + var grammarForms = mediaWiki.language.getData( 'ga', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'ainmlae': diff --git a/resources/mediawiki.language/languages/he.js b/resources/mediawiki.language/languages/he.js index d35f77ed89..13d457b26e 100644 --- a/resources/mediawiki.language/languages/he.js +++ b/resources/mediawiki.language/languages/he.js @@ -3,26 +3,26 @@ */ mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'he', 'grammarForms' ); + var grammarForms = mediaWiki.language.getData( 'he', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'prefixed': case 'תחילית': // the same word in Hebrew // Duplicate prefixed "Waw", but only if it's not already double - if ( word.substr( 0, 1 ) === "ו" && word.substr( 0, 2 ) !== "וו" ) { - word = "ו" + word; + if ( word.substr( 0, 1 ) === 'ו' && word.substr( 0, 2 ) !== 'וו' ) { + word = 'ו' + word; } // Remove the "He" if prefixed - if ( word.substr( 0, 1 ) === "ה" ) { + if ( word.substr( 0, 1 ) === 'ה' ) { word = word.substr( 1, word.length ); } // Add a hyphen (maqaf) before numbers and non-Hebrew letters - if ( word.substr( 0, 1 ) < "א" || word.substr( 0, 1 ) > "ת" ) { - word = "־" + word; + if ( word.substr( 0, 1 ) < 'א' || word.substr( 0, 1 ) > 'ת' ) { + word = '־' + word; } } return word; diff --git a/resources/mediawiki.language/languages/hsb.js b/resources/mediawiki.language/languages/hsb.js index 211d67b551..77dca75e28 100644 --- a/resources/mediawiki.language/languages/hsb.js +++ b/resources/mediawiki.language/languages/hsb.js @@ -2,10 +2,10 @@ * Upper Sorbian (Hornjoserbsce) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms =mw.language.getData( 'hsb', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms = mediaWiki.language.getData( 'hsb', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'instrumental': // instrumental diff --git a/resources/mediawiki.language/languages/hu.js b/resources/mediawiki.language/languages/hu.js index eb3f1f3a49..23b0c12553 100644 --- a/resources/mediawiki.language/languages/hu.js +++ b/resources/mediawiki.language/languages/hu.js @@ -3,10 +3,10 @@ * @author Santhosh Thottingal */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'hu', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms = mediaWiki.language.getData( 'hu', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'rol': diff --git a/resources/mediawiki.language/languages/hy.js b/resources/mediawiki.language/languages/hy.js index 215e750474..65081bdde1 100644 --- a/resources/mediawiki.language/languages/hy.js +++ b/resources/mediawiki.language/languages/hy.js @@ -2,10 +2,11 @@ * Armenian (Հայերեն) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'hy', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + /*jshint onecase:true */ + var grammarForms = mediaWiki.language.getData( 'hy', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } // These rules are not perfect, but they are currently only used for site names so it doesn't @@ -13,14 +14,15 @@ mediaWiki.language.convertGrammar = function( word, form ) { switch ( form ) { case 'genitive': // սեռական հոլով - if ( word.substr( -1 ) === 'ա' ) + if ( word.substr( -1 ) === 'ա' ) { word = word.substr( 0, word.length -1 ) + 'այի'; - else if ( word.substr( -1 ) === 'ո' ) + } else if ( word.substr( -1 ) === 'ո' ) { word = word.substr( 0, word.length - 1 ) + 'ոյի'; - else if ( word.substr( -4 ) === 'գիրք' ) + } else if ( word.substr( -4 ) === 'գիրք' ) { word = word.substr( 0, word.length - 4 ) + 'գրքի'; - else + } else { word = word + 'ի'; + } break; } return word; diff --git a/resources/mediawiki.language/languages/la.js b/resources/mediawiki.language/languages/la.js index 313bb1c202..27110241f7 100644 --- a/resources/mediawiki.language/languages/la.js +++ b/resources/mediawiki.language/languages/la.js @@ -3,10 +3,10 @@ * @author Santhosh Thottingal */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'la', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms = mediaWiki.language.getData( 'la', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'genitive': diff --git a/resources/mediawiki.language/languages/os.js b/resources/mediawiki.language/languages/os.js index 431e38c808..682b390311 100644 --- a/resources/mediawiki.language/languages/os.js +++ b/resources/mediawiki.language/languages/os.js @@ -4,23 +4,24 @@ */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'os', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms = mediaWiki.language.getData( 'os', 'grammarForms' ), + // Ending for allative case + endAllative = 'мæ', + // Variable for 'j' beetwen vowels + jot = '', + // Variable for "-" for not Ossetic words + hyphen = '', + // Variable for ending + ending = ''; + if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } - // Ending for allative case - var end_allative = 'мæ'; - // Variable for 'j' beetwen vowels - var jot = ''; - // Variable for "-" for not Ossetic words - var hyphen = ''; - // Variable for ending - var ending = ''; // Checking if the $word is in plural form if ( word.match( /тæ$/i ) ) { word = word.substring( 0, word.length - 1 ); - end_allative = 'æм'; + endAllative = 'æм'; } // Works if word is in singular form. // Checking if word ends on one of the vowels: е, ё, и, о, ы, э, ю, я. @@ -45,10 +46,10 @@ mediaWiki.language.convertGrammar = function( word, form ) { ending = hyphen + jot + 'æн'; break; case 'allative': - ending = hyphen + end_allative; + ending = hyphen + endAllative; break; case 'ablative': - if ( jot == 'й' ) { + if ( jot === 'й' ) { ending = hyphen + jot + 'æ'; } else { diff --git a/resources/mediawiki.language/languages/ru.js b/resources/mediawiki.language/languages/ru.js index cfdbfc3baf..b27dea43aa 100644 --- a/resources/mediawiki.language/languages/ru.js +++ b/resources/mediawiki.language/languages/ru.js @@ -2,27 +2,28 @@ * Russian (Русский) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'ru', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + /*jshint noempty:false, onecase:true */ + var grammarForms = mediaWiki.language.getData( 'ru', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'genitive': // родительный падеж - if ( ( word.substr( word.length - 4 ) == 'вики' ) || ( word.substr( word.length - 4 ) == 'Вики' ) ) { - } - else if ( word.substr( word.length - 1 ) == 'ь' ) + if ( ( word.substr( word.length - 4 ) === 'вики' ) || ( word.substr( word.length - 4 ) === 'Вики' ) ) { + } else if ( word.substr( word.length - 1 ) === 'ь' ) { word = word.substr(0, word.length - 1 ) + 'я'; - else if ( word.substr( word.length - 2 ) == 'ия' ) + } else if ( word.substr( word.length - 2 ) === 'ия' ) { word = word.substr(0, word.length - 2 ) + 'ии'; - else if ( word.substr( word.length - 2 ) == 'ка' ) + } else if ( word.substr( word.length - 2 ) === 'ка' ) { word = word.substr(0, word.length - 2 ) + 'ки'; - else if ( word.substr( word.length - 2 ) == 'ти' ) + } else if ( word.substr( word.length - 2 ) === 'ти' ) { word = word.substr(0, word.length - 2 ) + 'тей'; - else if ( word.substr( word.length - 2 ) == 'ды' ) + } else if ( word.substr( word.length - 2 ) === 'ды' ) { word = word.substr(0, word.length - 2 ) + 'дов'; - else if ( word.substr( word.length - 3 ) == 'ник' ) + } else if ( word.substr( word.length - 3 ) === 'ник' ) { word = word.substr(0, word.length - 3 ) + 'ника'; + } break; } return word; diff --git a/resources/mediawiki.language/languages/sl.js b/resources/mediawiki.language/languages/sl.js index acd00bfd52..fb335b6a70 100644 --- a/resources/mediawiki.language/languages/sl.js +++ b/resources/mediawiki.language/languages/sl.js @@ -2,10 +2,10 @@ * Slovenian (Slovenščina) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'sl', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + var grammarForms = mediaWiki.language.getData( 'sl', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'mestnik': // locative diff --git a/resources/mediawiki.language/languages/uk.js b/resources/mediawiki.language/languages/uk.js index ee110b0640..5e56b66f31 100644 --- a/resources/mediawiki.language/languages/uk.js +++ b/resources/mediawiki.language/languages/uk.js @@ -2,33 +2,35 @@ * Ukrainian (Українська) language functions */ -mediaWiki.language.convertGrammar = function( word, form ) { - var grammarForms = mw.language.getData( 'uk', 'grammarForms' ); +mediaWiki.language.convertGrammar = function ( word, form ) { + /*jshint noempty:false */ + var grammarForms = mediaWiki.language.getData( 'uk', 'grammarForms' ); if ( grammarForms && grammarForms[form] ) { - return grammarForms[form][word] ; + return grammarForms[form][word]; } switch ( form ) { case 'genitive': // родовий відмінок - if ( ( word.substr( word.length - 4 ) == 'вікі' ) || ( word.substr( word.length - 4 ) == 'Вікі' ) ) { - } - else if ( word.substr( word.length - 1 ) == 'ь' ) + if ( ( word.substr( word.length - 4 ) === 'вікі' ) || ( word.substr( word.length - 4 ) === 'Вікі' ) ) { + } else if ( word.substr( word.length - 1 ) === 'ь' ) { word = word.substr(0, word.length - 1 ) + 'я'; - else if ( word.substr( word.length - 2 ) == 'ія' ) + } else if ( word.substr( word.length - 2 ) === 'ія' ) { word = word.substr(0, word.length - 2 ) + 'ії'; - else if ( word.substr( word.length - 2 ) == 'ка' ) + } else if ( word.substr( word.length - 2 ) === 'ка' ) { word = word.substr(0, word.length - 2 ) + 'ки'; - else if ( word.substr( word.length - 2 ) == 'ти' ) + } else if ( word.substr( word.length - 2 ) === 'ти' ) { word = word.substr(0, word.length - 2 ) + 'тей'; - else if ( word.substr( word.length - 2 ) == 'ды' ) + } else if ( word.substr( word.length - 2 ) === 'ды' ) { word = word.substr(0, word.length - 2 ) + 'дов'; - else if ( word.substr( word.length - 3 ) == 'ник' ) + } else if ( word.substr( word.length - 3 ) === 'ник' ) { word = word.substr(0, word.length - 3 ) + 'ника'; + } break; case 'accusative': // знахідний відмінок - if ( ( word.substr( word.length - 4 ) == 'вікі' ) || ( word.substr( word.length - 4 ) == 'Вікі' ) ) { + if ( ( word.substr( word.length - 4 ) === 'вікі' ) || ( word.substr( word.length - 4 ) === 'Вікі' ) ) { } - else if ( word.substr( word.length - 2 ) == 'ія' ) + else if ( word.substr( word.length - 2 ) === 'ія' ) { word = word.substr(0, word.length - 2 ) + 'ію'; + } break; } return word; -- 2.20.1