Nikerabbit has submitted this change and it was merged. Change subject: Migrate to JSON i18n ......................................................................
Migrate to JSON i18n Procedure per https://www.mediawiki.org/wiki/Manual:GenerateJsonI18n.php with shim. Change-Id: I769b0bc6c0350551cdc3e46b2748d409199af029 --- M HSTS.i18n.php M HSTS.php A i18n/ast.json A i18n/de.json A i18n/en.json A i18n/es.json A i18n/fa.json A i18n/fr.json A i18n/gl.json A i18n/he.json A i18n/hsb.json A i18n/it.json A i18n/ja.json A i18n/ko.json A i18n/lb.json A i18n/mk.json A i18n/nl.json A i18n/oc.json A i18n/pt-br.json A i18n/qqq.json A i18n/roa-tara.json A i18n/ru.json A i18n/sv.json A i18n/uk.json A i18n/yi.json A i18n/zh-hans.json 26 files changed, 260 insertions(+), 208 deletions(-) Approvals: Nikerabbit: Verified; Looks good to me, approved diff --git a/HSTS.i18n.php b/HSTS.i18n.php index 5f43002..eeb2776 100644 --- a/HSTS.i18n.php +++ b/HSTS.i18n.php @@ -1,197 +1,31 @@ <?php +/** + * This is a backwards-compatibility shim, generated by: + * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php + * + * Beginning with MediaWiki 1.23, translation strings are stored in json files, + * and the EXTENSION.i18n.php file only exists to provide compatibility with + * older releases of MediaWiki. For more information about this migration, see: + * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format + * + * This shim maintains compatibility back to MediaWiki 1.17. + */ $messages = array(); +$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code, &$cachedData ) { + $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); + foreach ( $codeSequence as $csCode ) { + $fileName = __DIR__ . "/i18n/$csCode.json"; + if ( is_readable( $fileName ) ) { + $data = FormatJson::decode( file_get_contents( $fileName ), true ); + foreach ( array_keys( $data ) as $key ) { + if ( $key === '' || $key[0] === '@' ) { + unset( $data[$key] ); + } + } + $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); + } -/** English - * @author Seb35 - */ -$messages['en'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) on a per-user basis', - 'hsts-tog' => 'Enable HTTP Strict Transport Security (HSTS)' -); - -/** Message documentation (Message documentation) - * @author Seb35 - * @author Shirayuki - */ -$messages['qqq'] = array( - 'hsts-desc' => '{{desc|name=HSTS|url=//www.mediawiki.org/wiki/Extension:HSTS}}', - 'hsts-tog' => 'Used in [[Special:Preferences]]. - -Used as label for the checkbox which is used to enable HSTS.', -); - -/** Asturian (asturianu) - * @author Xuacu - */ -$messages['ast'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) activáu pol usuariu', - 'hsts-tog' => 'Activar HTTP Strict Transport Security (HSTS)', -); - -/** German (Deutsch) - * @author Metalhead64 - */ -$messages['de'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) auf Benutzerbasis', - 'hsts-tog' => 'HTTP Strict Transport Security (HSTS) aktivieren', -); - -/** Spanish (español) - * @author Fitoschido - */ -$messages['es'] = array( - 'hsts-desc' => "HSTS (''HTTP Strict Transport Security'') en función de cada usuario", - 'hsts-tog' => 'Activar el modo de seguridad de transporte estricta de HTTP (HSTS)', -); - -/** Persian (فارسی) - * @author Armin1392 - */ -$messages['fa'] = array( - 'hsts-desc' => 'اچاستیاس (امنیت نقل و انتقال سخت اچتیتیپی) بر اساس هر کاربر', - 'hsts-tog' => 'فعال کردن امنیت نقل و انتقال سخت (اچتیتیپی)', -); - -/** French (français) - * @author Seb35 - */ -$messages['fr'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) configurable par utilisateur', - 'hsts-tog' => 'Activer HTTP Strict Transport Security (HSTS)', -); - -/** Galician (galego) - * @author Toliño - */ -$messages['gl'] = array( - 'hsts-desc' => 'Mecanismo HSTS (HTTP Strict Transport Security) activable a nivel de cada usuario', - 'hsts-tog' => 'Activar o mecanismo HTTP Strict Transport Security (HSTS)', -); - -/** Hebrew (עברית) - * @author Amire80 - */ -$messages['he'] = array( - 'hsts-desc' => 'הפעלת HSTS (HTTP Strict Transport Security) ברמת משתמשים פרטניים', - 'hsts-tog' => 'הפעלת HTTP Strict Transport Security (HSTS)', -); - -/** Upper Sorbian (hornjoserbsce) - * @author Michawiki - */ -$messages['hsb'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) na wužiwarskej bazy', - 'hsts-tog' => 'HTTP Strict Transport Security (HSTS) zmóžnić', -); - -/** Italian (italiano) - * @author Beta16 - */ -$messages['it'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) per singolo utente', - 'hsts-tog' => 'Abilita HTTP Strict Transport Security (HSTS)', -); - -/** Japanese (日本語) - * @author Shirayuki - */ -$messages['ja'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) を、利用者の個人設定に応じて有効にする', - 'hsts-tog' => 'HTTP Strict Transport Security (HSTS) を有効にする', -); - -/** Korean (한국어) - * @author Priviet - */ -$messages['ko'] = array( - 'hsts-desc' => '사용자 설정에 기반한 HSTS(HTTP Strict Transport Security)', - 'hsts-tog' => 'HSTS(HTTP Strict Transport Security)를 활성화', -); - -/** Luxembourgish (Lëtzebuergesch) - * @author Robby - */ -$messages['lb'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) op Benotzerbasis', - 'hsts-tog' => 'HTTP Strict Transport Security (HSTS) aktivéieren', -); - -/** Macedonian (македонски) - * @author Bjankuloski06 - */ -$messages['mk'] = array( - 'hsts-desc' => 'HSTS (Строга преносна безбедност во HTTP) по корисник', - 'hsts-tog' => 'Вклучи Строга преносна безбедност во HTTP (HSTS)', -); - -/** Dutch (Nederlands) - * @author Siebrand - */ -$messages['nl'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) per gebruiker', - 'hsts-tog' => 'HTTP Strict Transport Security (HSTS) inschakelen', -); - -/** Occitan (occitan) - * @author Cedric31 - */ -$messages['oc'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) configurable per utilizaire', - 'hsts-tog' => 'Activar HTTP Strict Transport Security (HSTS)', -); - -/** Brazilian Portuguese (português do Brasil) - * @author Fúlvio - */ -$messages['pt-br'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) em uma base por usuário', - 'hsts-tog' => 'Ativar HTTP Strict Transport Security (HSTS)', -); - -/** tarandíne (tarandíne) - * @author Joetaras - */ -$messages['roa-tara'] = array( - 'hsts-desc' => "HSTS (HTTP Securezze de Trasporte Strette) sus a 'nu punde base de utende", - 'hsts-tog' => 'Abbilite HQQQP Securezze de Trasporte Strette (HSTS)', -); - -/** Russian (русский) - * @author Okras - */ -$messages['ru'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) на уровне пользователя', - 'hsts-tog' => 'Включить HTTP Strict Transport Security (HSTS)', -); - -/** Swedish (svenska) - * @author Skalman - */ -$messages['sv'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) på en per-användare-basis', - 'hsts-tog' => 'Aktivera HTTP Strict Transport Security (HSTS)', -); - -/** Ukrainian (українська) - * @author Andriykopanytsia - */ -$messages['uk'] = array( - 'hsts-desc' => 'HSTS (HTTP Строга Безпека Передачі) на рівні користувача', - 'hsts-tog' => 'Увімкнути HTTP строгу безпеку передачі (HSTS)', -); - -/** Yiddish (ייִדיש) - * @author פוילישער - */ -$messages['yi'] = array( - 'hsts-desc' => 'HSTS (HTTP Strict Transport Security) אויף א באניצער־באזיס', - 'hsts-tog' => 'אקטיווירן HTTP Strict Transport Security (HSTS)', -); - -/** Simplified Chinese (中文（简体）) - * @author Qiyue2001 - */ -$messages['zh-hans'] = array( - 'hsts-desc' => '根据个人设置启用HSTS（HTTP 严格传输安全）', - 'hsts-tog' => '启用 HTTP 严格传输安全（HSTS）', -); + $cachedData['deps'][] = new FileDependency( $fileName ); + } + return true; +}; diff --git a/HSTS.php b/HSTS.php index a0f80a0..a64096c 100644 --- a/HSTS.php +++ b/HSTS.php @@ -1,17 +1,17 @@ <?php - + /** * Extension enabling the HSTS on a MediaWiki website on a per-user basis - * + * * Note if you intend to activate HSTS on the whole website, it will be more efficient and robust * to add it directly in the server configuration - * + * * @file * @ingroup Extensions * @author Seb35 * @licence WTFPL 2.0 * / - + /* Options */ $wgDefaultUserOptions['hsts'] = 0; // Default value of HSTS for anonymous visitors and newly created accounts $wgHSTSMaxAge = 30*86400; // max-age parameter for HSTS; can be either: @@ -21,28 +21,29 @@ // configure accordingly your cache servers for a consistent user experience, // particularly given the authoritative HSTS header is the last sent, even if shorter. $wgHSTSIncludeSubdomains = false; // includeSubDomains parameter for HSTS; boolean - - + + /* Register hooks */ - + $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'HSTS', 'author' => 'Seb35', - 'version' => '0.1', + 'version' => '0.2.0', 'url' => 'https://www.mediawiki.org/wiki/Extension:HSTS', 'descriptionmsg' => 'hsts-desc', ); - + $dir = dirname( __FILE__ ) . '/'; +$wgMessagesDirs['HSTS'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['HSTS'] = $dir . 'HSTS.i18n.php'; - + $wgHooks['GetPreferences'][] = 'HSTSPreference'; $wgHooks['BeforePageDisplay'][] = 'HSTSAddHeader'; - - + + /* Code */ - + function HSTSPreference( $user, &$preferences ) { $preferences['hsts'] = array( 'type' => 'toggle', @@ -51,7 +52,7 @@ ); return true; } - + function HSTSAddHeader( $output ) { global $wgHSTSIncludeSubdomains, $wgHSTSMaxAge; if( $output->getRequest()->detectProtocol() != 'https' || !$output->getUser()->getOption( 'hsts' ) ) return true; diff --git a/i18n/ast.json b/i18n/ast.json new file mode 100644 index 0000000..381942b --- /dev/null +++ b/i18n/ast.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Xuacu" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) activáu pol usuariu", + "hsts-tog": "Activar HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/de.json b/i18n/de.json new file mode 100644 index 0000000..8678f94 --- /dev/null +++ b/i18n/de.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Metalhead64" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) auf Benutzerbasis", + "hsts-tog": "HTTP Strict Transport Security (HSTS) aktivieren" +} \ No newline at end of file diff --git a/i18n/en.json b/i18n/en.json new file mode 100644 index 0000000..553735a --- /dev/null +++ b/i18n/en.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Seb35" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) on a per-user basis", + "hsts-tog": "Enable HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/es.json b/i18n/es.json new file mode 100644 index 0000000..bf076ce --- /dev/null +++ b/i18n/es.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Fitoschido" + ] + }, + "hsts-desc": "HSTS (''HTTP Strict Transport Security'') en función de cada usuario", + "hsts-tog": "Activar el modo de seguridad de transporte estricta de HTTP (HSTS)" +} \ No newline at end of file diff --git a/i18n/fa.json b/i18n/fa.json new file mode 100644 index 0000000..80c897c --- /dev/null +++ b/i18n/fa.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Armin1392" + ] + }, + "hsts-desc": "اچاستیاس (امنیت نقل و انتقال سخت اچتیتیپی) بر اساس هر کاربر", + "hsts-tog": "فعال کردن امنیت نقل و انتقال سخت (اچتیتیپی)" +} \ No newline at end of file diff --git a/i18n/fr.json b/i18n/fr.json new file mode 100644 index 0000000..d2198a4 --- /dev/null +++ b/i18n/fr.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Seb35" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) configurable par utilisateur", + "hsts-tog": "Activer HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/gl.json b/i18n/gl.json new file mode 100644 index 0000000..b1212d6 --- /dev/null +++ b/i18n/gl.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Toliño" + ] + }, + "hsts-desc": "Mecanismo HSTS (HTTP Strict Transport Security) activable a nivel de cada usuario", + "hsts-tog": "Activar o mecanismo HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/he.json b/i18n/he.json new file mode 100644 index 0000000..ff76cca --- /dev/null +++ b/i18n/he.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Amire80" + ] + }, + "hsts-desc": "הפעלת HSTS (HTTP Strict Transport Security) ברמת משתמשים פרטניים", + "hsts-tog": "הפעלת HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/hsb.json b/i18n/hsb.json new file mode 100644 index 0000000..db1fee0 --- /dev/null +++ b/i18n/hsb.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Michawiki" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) na wužiwarskej bazy", + "hsts-tog": "HTTP Strict Transport Security (HSTS) zmóžnić" +} \ No newline at end of file diff --git a/i18n/it.json b/i18n/it.json new file mode 100644 index 0000000..18ad22c --- /dev/null +++ b/i18n/it.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Beta16" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) per singolo utente", + "hsts-tog": "Abilita HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/ja.json b/i18n/ja.json new file mode 100644 index 0000000..ebee8fd --- /dev/null +++ b/i18n/ja.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Shirayuki" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) を、利用者の個人設定に応じて有効にする", + "hsts-tog": "HTTP Strict Transport Security (HSTS) を有効にする" +} \ No newline at end of file diff --git a/i18n/ko.json b/i18n/ko.json new file mode 100644 index 0000000..90229f2 --- /dev/null +++ b/i18n/ko.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Priviet" + ] + }, + "hsts-desc": "사용자 설정에 기반한 HSTS(HTTP Strict Transport Security)", + "hsts-tog": "HSTS(HTTP Strict Transport Security)를 활성화" +} \ No newline at end of file diff --git a/i18n/lb.json b/i18n/lb.json new file mode 100644 index 0000000..6fab8eb --- /dev/null +++ b/i18n/lb.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Robby" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) op Benotzerbasis", + "hsts-tog": "HTTP Strict Transport Security (HSTS) aktivéieren" +} \ No newline at end of file diff --git a/i18n/mk.json b/i18n/mk.json new file mode 100644 index 0000000..f424f4f --- /dev/null +++ b/i18n/mk.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Bjankuloski06" + ] + }, + "hsts-desc": "HSTS (Строга преносна безбедност во HTTP) по корисник", + "hsts-tog": "Вклучи Строга преносна безбедност во HTTP (HSTS)" +} \ No newline at end of file diff --git a/i18n/nl.json b/i18n/nl.json new file mode 100644 index 0000000..aac4391 --- /dev/null +++ b/i18n/nl.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Siebrand" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) per gebruiker", + "hsts-tog": "HTTP Strict Transport Security (HSTS) inschakelen" +} \ No newline at end of file diff --git a/i18n/oc.json b/i18n/oc.json new file mode 100644 index 0000000..96d9700 --- /dev/null +++ b/i18n/oc.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Cedric31" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) configurable per utilizaire", + "hsts-tog": "Activar HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/pt-br.json b/i18n/pt-br.json new file mode 100644 index 0000000..f5f7f4f --- /dev/null +++ b/i18n/pt-br.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Fúlvio" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) em uma base por usuário", + "hsts-tog": "Ativar HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/qqq.json b/i18n/qqq.json new file mode 100644 index 0000000..7a025ec --- /dev/null +++ b/i18n/qqq.json @@ -0,0 +1,10 @@ +{ + "@metadata": { + "authors": [ + "Seb35", + "Shirayuki" + ] + }, + "hsts-desc": "{{desc|name=HSTS|url=//www.mediawiki.org/wiki/Extension:HSTS}}", + "hsts-tog": "Used in [[Special:Preferences]].\n\nUsed as label for the checkbox which is used to enable HSTS." +} \ No newline at end of file diff --git a/i18n/roa-tara.json b/i18n/roa-tara.json new file mode 100644 index 0000000..65acb78 --- /dev/null +++ b/i18n/roa-tara.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Joetaras" + ] + }, + "hsts-desc": "HSTS (HTTP Securezze de Trasporte Strette) sus a 'nu punde base de utende", + "hsts-tog": "Abbilite HQQQP Securezze de Trasporte Strette (HSTS)" +} \ No newline at end of file diff --git a/i18n/ru.json b/i18n/ru.json new file mode 100644 index 0000000..0eff0dd --- /dev/null +++ b/i18n/ru.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Okras" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) на уровне пользователя", + "hsts-tog": "Включить HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/sv.json b/i18n/sv.json new file mode 100644 index 0000000..d8eebf2 --- /dev/null +++ b/i18n/sv.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Skalman" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) på en per-användare-basis", + "hsts-tog": "Aktivera HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/uk.json b/i18n/uk.json new file mode 100644 index 0000000..77fd3bf --- /dev/null +++ b/i18n/uk.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Andriykopanytsia" + ] + }, + "hsts-desc": "HSTS (HTTP Строга Безпека Передачі) на рівні користувача", + "hsts-tog": "Увімкнути HTTP строгу безпеку передачі (HSTS)" +} \ No newline at end of file diff --git a/i18n/yi.json b/i18n/yi.json new file mode 100644 index 0000000..a20b7b4 --- /dev/null +++ b/i18n/yi.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "פוילישער" + ] + }, + "hsts-desc": "HSTS (HTTP Strict Transport Security) אויף א באניצער־באזיס", + "hsts-tog": "אקטיווירן HTTP Strict Transport Security (HSTS)" +} \ No newline at end of file diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json new file mode 100644 index 0000000..1ff07fb --- /dev/null +++ b/i18n/zh-hans.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Qiyue2001" + ] + }, + "hsts-desc": "根据个人设置启用HSTS（HTTP 严格传输安全）", + "hsts-tog": "启用 HTTP 严格传输安全（HSTS）" +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/122670 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I769b0bc6c0350551cdc3e46b2748d409199af029 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HSTS Gerrit-Branch: master Gerrit-Owner: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
