From a0812713f224091072a652c4e319a7af1ea1dee3 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 9 Aug 2014 17:56:27 +0200 Subject: [PATCH] Change right "vote" to "voteny" to prevent key conflicts in L10n Change-Id: Ifb33bf886204845c014abfbaadb536fde95bde4e --- VoteClass.php | 2 +- VoteNY.php | 6 +++--- Vote_AjaxFunctions.php | 12 ++++++------ i18n/ast.json | 2 +- i18n/ca.json | 2 +- i18n/de.json | 2 +- i18n/diq.json | 2 +- i18n/dsb.json | 2 +- i18n/en.json | 2 +- i18n/es.json | 2 +- i18n/fa.json | 2 +- i18n/fr.json | 2 +- i18n/frp.json | 2 +- i18n/gl.json | 2 +- i18n/he.json | 2 +- i18n/hsb.json | 2 +- i18n/it.json | 2 +- i18n/ja.json | 2 +- i18n/ko.json | 2 +- i18n/ksh.json | 2 +- i18n/lb.json | 2 +- i18n/mk.json | 2 +- i18n/ms.json | 2 +- i18n/nl.json | 2 +- i18n/pms.json | 2 +- i18n/ps.json | 2 +- i18n/qqq.json | 2 +- i18n/roa-tara.json | 2 +- i18n/ru.json | 2 +- i18n/si.json | 2 +- i18n/sv.json | 2 +- i18n/tl.json | 2 +- i18n/uk.json | 2 +- i18n/zh-hans.json | 2 +- i18n/zh-hant.json | 2 +- 35 files changed, 42 insertions(+), 42 deletions(-) diff --git a/VoteClass.php b/VoteClass.php index d641ff6..430b8b1 100644 --- a/VoteClass.php +++ b/VoteClass.php @@ -218,7 +218,7 @@ class Vote { $output .= ''; $output .= '
'; - if ( !$wgUser->isAllowed( 'vote' ) ) { + if ( !$wgUser->isAllowed( 'voteny' ) ) { // @todo FIXME: this is horrible. If we don't have enough // permissions to vote, we should tell the end-user /that/, // not require them to log in! diff --git a/VoteNY.php b/VoteNY.php index 8111bf1..38384f8 100644 --- a/VoteNY.php +++ b/VoteNY.php @@ -32,9 +32,9 @@ $wgExtensionCredits['parserhook'][] = array( $wgVoteDirectory = "$IP/extensions/VoteNY"; // New user right -$wgAvailableRights[] = 'vote'; -$wgGroupPermissions['*']['vote'] = false; // Anonymous users cannot vote -$wgGroupPermissions['user']['vote'] = true; // Registered users can vote +$wgAvailableRights[] = 'voteny'; +$wgGroupPermissions['*']['voteny'] = false; // Anonymous users cannot vote +$wgGroupPermissions['user']['voteny'] = true; // Registered users can vote // AJAX functions needed by this extension require_once( 'Vote_AjaxFunctions.php' ); diff --git a/Vote_AjaxFunctions.php b/Vote_AjaxFunctions.php index da9505f..311f6f5 100644 --- a/Vote_AjaxFunctions.php +++ b/Vote_AjaxFunctions.php @@ -7,7 +7,7 @@ $wgAjaxExportList[] = 'wfVoteClick'; function wfVoteClick( $voteValue, $pageId ) { global $wgUser; - if ( !$wgUser->isAllowed( 'vote' ) ) { + if ( !$wgUser->isAllowed( 'voteny' ) ) { return ''; } @@ -25,7 +25,7 @@ $wgAjaxExportList[] = 'wfVoteDelete'; function wfVoteDelete( $pageId ) { global $wgUser; - if ( !$wgUser->isAllowed( 'vote' ) ) { + if ( !$wgUser->isAllowed( 'voteny' ) ) { return ''; } @@ -43,7 +43,7 @@ $wgAjaxExportList[] = 'wfVoteStars'; function wfVoteStars( $voteValue, $pageId ) { global $wgUser; - if ( !$wgUser->isAllowed( 'vote' ) ) { + if ( !$wgUser->isAllowed( 'voteny' ) ) { return ''; } @@ -60,7 +60,7 @@ $wgAjaxExportList[] = 'wfVoteStarsMulti'; function wfVoteStarsMulti( $voteValue, $pageId ) { global $wgUser; - if ( !$wgUser->isAllowed( 'vote' ) ) { + if ( !$wgUser->isAllowed( 'voteny' ) ) { return ''; } @@ -77,7 +77,7 @@ $wgAjaxExportList[] = 'wfVoteStarsDelete'; function wfVoteStarsDelete( $pageId ) { global $wgUser; - if ( !$wgUser->isAllowed( 'vote' ) ) { + if ( !$wgUser->isAllowed( 'voteny' ) ) { return ''; } @@ -85,4 +85,4 @@ function wfVoteStarsDelete( $pageId ) { $vote->delete(); return $vote->display(); -} \ No newline at end of file +} diff --git a/i18n/ast.json b/i18n/ast.json index 5b0f87f..0d3feed 100644 --- a/i18n/ast.json +++ b/i18n/ast.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|un votu|$1 votos}}", "topratings": "Páxines meyor calificaes", "topratings-no-pages": "Nun hai páxines meyor calificaes", - "right-vote": "Votar páxines" + "right-voteny": "Votar páxines" } diff --git a/i18n/ca.json b/i18n/ca.json index 86101e9..adcabf1 100644 --- a/i18n/ca.json +++ b/i18n/ca.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|un vot|$1 vots}}", "topratings": "Pàgines més valorades", "topratings-no-pages": "No hi ha cap pàgina valorada.", - "right-vote": "Pàgines de votació" + "right-voteny": "Pàgines de votació" } diff --git a/i18n/de.json b/i18n/de.json index 121e049..f91d07b 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -16,5 +16,5 @@ "votes": "{{PLURAL:$1|eine Stimme|$1 Stimmen}}", "topratings": "Höchstbewertete Seiten", "topratings-no-pages": "Es sind keine höchstbewerteten Seiten vorhanden.", - "right-vote": "Abstimmen über Seiten" + "right-voteny": "Abstimmen über Seiten" } diff --git a/i18n/diq.json b/i18n/diq.json index 3eea80c..8055144 100644 --- a/i18n/diq.json +++ b/i18n/diq.json @@ -11,5 +11,5 @@ "ratings": "{{PLURAL:$1|yew nırğnayış|$1 nırğnayışi}}", "remove": "wedare", "votes": "{{PLURAL:$1|yew rey|$1 reyi}}", - "right-vote": "Pelê reydayışi" + "right-voteny": "Pelê reydayışi" } diff --git a/i18n/dsb.json b/i18n/dsb.json index 0a6c2e5..4793bc6 100644 --- a/i18n/dsb.json +++ b/i18n/dsb.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|jaden głos|$1 głosa|$1 głose|$1 głosow}}", "topratings": "Nejwuše pógódnośone boki", "topratings-no-pages": "Žedne nejwuše pógódnośone boki.", - "right-vote": "Wótgłosowańske boki" + "right-voteny": "Wótgłosowańske boki" } diff --git a/i18n/en.json b/i18n/en.json index e4d0afa..b97a5f9 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -15,5 +15,5 @@ "voteny-votes": "{{PLURAL:$1|one vote|$1 votes}}", "topratings": "Top rated pages", "topratings-no-pages": "No top rated pages.", - "right-vote": "Vote pages" + "right-voteny": "Vote pages" } diff --git a/i18n/es.json b/i18n/es.json index a410646..b768db5 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|un voto|$1 votos}}", "topratings": "Páginas más valoradas", "topratings-no-pages": "No hay páginas mejor valoradas", - "right-vote": "Páginas de votación" + "right-voteny": "Páginas de votación" } diff --git a/i18n/fa.json b/i18n/fa.json index 3cf5341..25a63d7 100644 --- a/i18n/fa.json +++ b/i18n/fa.json @@ -16,5 +16,5 @@ "votes": "{{PLURAL:$1|یک رای|$1 رای}}", "topratings": "صفحات دارای امتیاز بالا", "topratings-no-pages": "صفحه‌هایی با امتیاز بالا وجود ندارند.", - "right-vote": "صفحه‌های رأی" + "right-voteny": "صفحه‌های رأی" } diff --git a/i18n/fr.json b/i18n/fr.json index d1475a1..b89adf8 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -16,5 +16,5 @@ "votes": "{{PLURAL:$1|un vote|$1 votes}}", "topratings": "Pages les mieux notées", "topratings-no-pages": "Aucune page notée.", - "right-vote": "Pages de vote" + "right-voteny": "Pages de vote" } diff --git a/i18n/frp.json b/i18n/frp.json index 61f612c..6bb2a90 100644 --- a/i18n/frp.json +++ b/i18n/frp.json @@ -11,5 +11,5 @@ "remove": "enlevar", "gave-this": "vos éd balyê $1", "votes": "{{PLURAL:$1|yon voto|$1 votos}}", - "right-vote": "Votar des pâges" + "right-voteny": "Votar des pâges" } diff --git a/i18n/gl.json b/i18n/gl.json index 28dd756..f22d32b 100644 --- a/i18n/gl.json +++ b/i18n/gl.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|un voto|$1 votos}}", "topratings": "Páxinas mellor valoradas", "topratings-no-pages": "Non hai ningunha páxina valorada.", - "right-vote": "Votar páxinas" + "right-voteny": "Votar páxinas" } diff --git a/i18n/he.json b/i18n/he.json index 9d118a3..fed1f8a 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1|הצבעה אחת|$1 הצבעות}}", "topratings": "דפים המדורגים ביותר", "topratings-no-pages": "דפים שדורגו הכי פחות פעמים.", - "right-vote": "דפי ההצבעה" + "right-voteny": "דפי ההצבעה" } diff --git a/i18n/hsb.json b/i18n/hsb.json index 11edb04..e278467 100644 --- a/i18n/hsb.json +++ b/i18n/hsb.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|jedyn hłós|$1 hłosaj|$1 hłosy|$1 hłosow}}", "topratings": "Najwyše pohódnoćene strony", "topratings-no-pages": "Žane najwyše pohódnoćene strony.", - "right-vote": "Wothłosowanske strony" + "right-voteny": "Wothłosowanske strony" } diff --git a/i18n/it.json b/i18n/it.json index 9a5df8a..0ae590f 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1|un voto|$1 voti}}", "topratings": "Pagine migliori", "topratings-no-pages": "Nessuna pagina migliore.", - "right-vote": "Vota le pagine" + "right-voteny": "Vota le pagine" } diff --git a/i18n/ja.json b/i18n/ja.json index f6eaf84..fb9ea1e 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|$1 票}}", "topratings": "評価が高いページ", "topratings-no-pages": "評価が高いページはありません。", - "right-vote": "ページに投票" + "right-voteny": "ページに投票" } diff --git a/i18n/ko.json b/i18n/ko.json index 97cc9b8..31bc9ab 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|한 표|$1표}}", "topratings": "평가가 높은 문서", "topratings-no-pages": "평가가 높은 문서가 없습니다.", - "right-vote": "문서 투표" + "right-voteny": "문서 투표" } diff --git a/i18n/ksh.json b/i18n/ksh.json index 801a770..9e4ea2e 100644 --- a/i18n/ksh.json +++ b/i18n/ksh.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|Ein Schtemm|$1 Schtemme|Kein Schtemme}}", "topratings": "Sigge met de hühste Bewertonge", "topratings-no-pages": "Kein Sigge met hühste Bewertonge jefonge.", - "right-vote": "Övver Siige afschtemme" + "right-voteny": "Övver Siige afschtemme" } diff --git a/i18n/lb.json b/i18n/lb.json index 2ec5a5b..00f4272 100644 --- a/i18n/lb.json +++ b/i18n/lb.json @@ -8,5 +8,5 @@ "unvote-link": "Stëmm zréckzéien", "remove": "ewechhuelen", "gave-this": "Dir hutt eng $1 ofginn", - "right-vote": "Ofstëmmen iwwer Säiten" + "right-voteny": "Ofstëmmen iwwer Säiten" } diff --git a/i18n/mk.json b/i18n/mk.json index 5159d1f..db2407d 100644 --- a/i18n/mk.json +++ b/i18n/mk.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|еден глас|$1 гласа}}", "topratings": "Водечки страници", "topratings-no-pages": "Нема водечки страници.", - "right-vote": "Гласање за страници" + "right-voteny": "Гласање за страници" } diff --git a/i18n/ms.json b/i18n/ms.json index 61f068d..0f369e4 100644 --- a/i18n/ms.json +++ b/i18n/ms.json @@ -14,5 +14,5 @@ "votes": "$1 undian", "topratings": "Halaman undian tertinggi", "topratings-no-pages": "Tiada halaman undian tertinggi.", - "right-vote": "Mengundi halaman" + "right-voteny": "Mengundi halaman" } diff --git a/i18n/nl.json b/i18n/nl.json index 8732b08..ed568d1 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1|één stem|$1 stemmen}}", "topratings": "Meest gewaardeerde pagina's", "topratings-no-pages": "Er zijn nog geen meest gewaardeerde pagina's.", - "right-vote": "Op pagina's stemmen" + "right-voteny": "Op pagina's stemmen" } diff --git a/i18n/pms.json b/i18n/pms.json index f780550..6eec1fd 100644 --- a/i18n/pms.json +++ b/i18n/pms.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1|un vot|$1 vot}}", "topratings": "Le pàgine valutà mej", "topratings-no-pages": "Gnun-e pàgine valutà.", - "right-vote": "Pàgine ëd vot" + "right-voteny": "Pàgine ëd vot" } diff --git a/i18n/ps.json b/i18n/ps.json index 0bf4f21..4a1e9c0 100644 --- a/i18n/ps.json +++ b/i18n/ps.json @@ -4,5 +4,5 @@ "Ahmed-Najib-Biabani-Ibrahimkhel" ] }, - "right-vote": "د رايې مخونه" + "right-voteny": "د رايې مخونه" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 68427a0..726fd91 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -16,5 +16,5 @@ "votes": "Parameters:\n* $1 - number of votes", "topratings": "{{doc-special|TopRatings}}", "topratings-no-pages": "Displayed on Special:TopRatings if there are no top rated pages, i.e. if no pages have been rated on the wiki at all.", - "right-vote": "{{doc-right|vote|prefix=Voteny-}}\nRight to place a vote on pages with the extension." + "right-voteny": "{{doc-right|vote|prefix=Voteny-}}\nRight to place a vote on pages with the extension." } diff --git a/i18n/roa-tara.json b/i18n/roa-tara.json index 1bb20d0..a4b3923 100644 --- a/i18n/roa-tara.json +++ b/i18n/roa-tara.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|'nu vote|$1 vote}}", "topratings": "Pàggene cchiù vutate", "topratings-no-pages": "Pàggene ca no stonne 'ngape a le vote.", - "right-vote": "Vote le vôsce" + "right-voteny": "Vote le vôsce" } diff --git a/i18n/ru.json b/i18n/ru.json index 8ff0594..d5ef366 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1|$1 голос|$1 голосов|$1 голоса}}", "topratings": "Самые популярные страницы", "topratings-no-pages": "Нет популярных страниц.", - "right-vote": "Страницы голосований" + "right-voteny": "Страницы голосований" } diff --git a/i18n/si.json b/i18n/si.json index 52d397b..8fc49d1 100644 --- a/i18n/si.json +++ b/i18n/si.json @@ -13,5 +13,5 @@ "votes": "{{PLURAL:$1|මනාපයක්|මනාප $1 ක්}}", "topratings": "ඉහළ ශ්‍රේණිගත පිටු", "topratings-no-pages": "ඉහළ ශ්‍රේණිගත පිටු නොමැත.", - "right-vote": "මනාප පිටු" + "right-voteny": "මනාප පිටු" } diff --git a/i18n/sv.json b/i18n/sv.json index 6d65744..2de13e3 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|en röst|$1 röster}}", "topratings": "Topplistade sidor", "topratings-no-pages": "Inga topplistade sidor.", - "right-vote": "Omröstningssidor" + "right-voteny": "Omröstningssidor" } diff --git a/i18n/tl.json b/i18n/tl.json index 8819def..844d380 100644 --- a/i18n/tl.json +++ b/i18n/tl.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1| isang boto| $1 mga boto}}", "topratings": "Mga pahinang nangunguna sa pag-aantas", "topratings-no-pages": "Walang mga pahinang nangunguna sa pag-aantas.", - "right-vote": "Iboto ang mga pahina" + "right-voteny": "Iboto ang mga pahina" } diff --git a/i18n/uk.json b/i18n/uk.json index c997559..2c75dd4 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -14,5 +14,5 @@ "votes": "{{PLURAL:$1|один голос|$1 голоси|$1 голосів}}", "topratings": "Сторінки із найвищим оцінками", "topratings-no-pages": "Сторінки із не найвищими оцінками.", - "right-vote": "Голосувати за сторінки" + "right-voteny": "Голосувати за сторінки" } diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json index 5fae652..1406ed6 100644 --- a/i18n/zh-hans.json +++ b/i18n/zh-hans.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1|$1票}}", "topratings": "最受好评的页面", "topratings-no-pages": "没有最受好评的页面。", - "right-vote": "投票页面" + "right-voteny": "投票页面" } diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json index da9a3a7..77aaa80 100644 --- a/i18n/zh-hant.json +++ b/i18n/zh-hant.json @@ -15,5 +15,5 @@ "votes": "{{PLURAL:$1|$1票}}", "topratings": "最受好評的頁面", "topratings-no-pages": "沒有最受好評的頁面。", - "right-vote": "投票頁面" + "right-voteny": "投票頁面" }