From 4c17a1d24fb6f6bdfd77a35c335e393f6d56428f Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Tue, 5 Nov 2024 15:27:01 +0100 Subject: [PATCH 1/5] Localisation updates from https://translatewiki.net. --- i18n/ar.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/ar.json b/i18n/ar.json index 60781f4e..cabfcf99 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -51,7 +51,7 @@ "liberty-pref-ads-header": "إزالة رأس الإعلانات.", "liberty-pref-ads-right": "إزالة الإعلانات الصحيحة.", "liberty-pref-ads-bottom": "إزالة الإعلانات السفلية.", - "liberty-pref-ads-belowarticle": "إزالة الإعلانات على المادة أدناه.", + "liberty-pref-ads-belowarticle": "إزالة الإعلانات الموجودة أسفل مساحة المقال", "right-blockads-header": "يمكن إزالة رأس الإعلانات على ليبرتي الجلد.", "right-blockads-right": "يمكن إزالة الإعلانات الصحيحة على ليبرتي الجلد.", "right-blockads-belowarticle": "يمكن إزالة الإعلانات المادة أدناه على ليبرتي الجلد.", From fefcd16dea852bea66dceeab041f30c9daefde3b Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 14 Nov 2024 13:10:42 +0100 Subject: [PATCH 2/5] Localisation updates from https://translatewiki.net. --- i18n/pa.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 i18n/pa.json diff --git a/i18n/pa.json b/i18n/pa.json new file mode 100644 index 00000000..5c117228 --- /dev/null +++ b/i18n/pa.json @@ -0,0 +1,25 @@ +{ + "@metadata": { + "authors": [ + "Cabal", + "Kuldeepburjbhalaike" + ] + }, + "skinname-liberty": "ਆਜ਼ਾਦੀ", + "liberty-dark-default": "ਨਜ਼ਰਅੰਦਾਜ਼ ਨਾ ਕਰੋ", + "liberty-feed-new": "[ਨਵਾਂ]", + "liberty-font-name-default": "ਮੂਲ", + "liberty-forgot-pw": "ਆਪਣਾ ਲੰਘ-ਸ਼ਬਦ ਭੁੱਲ ਗਏ ਹੋ?", + "liberty-layout-select-1200": "1200px (ਮੂਲ-ਰੂਪ)", + "liberty-login": "ਦਾਖ਼ਲ ਹੋਵੋ", + "liberty-login-alter": "ਹੋਰ ਢੰਗ ਨਾਲ ਦਾਖਲ ਹੋਵੋ", + "liberty-login-btn": "ਦਾਖ਼ਲ ਹੋਵੋ", + "liberty-info": "ਜਾਣਕਾਰੀ", + "liberty-purge": "ਸਾਫ਼ ਕਰੋ", + "liberty-recent-discussions": "ਹਾਲੀਆ ਚਰਚਾਵਾਂ", + "liberty-share": "ਸਾਂਝਾ ਕਰੋ", + "liberty-tooltip-purge": "ਇਸ ਸਫ਼ੇ ਦੀ ਕੈਸ਼ ਨੂੰ ਸਾਫ਼ ਕਰੋ।", + "liberty-view-more": "ਹੋਰ ਵੇਖੋ", + "liberty-pref-color-main": "ਮੁੱਖ ਰੰਗ", + "liberty-pref-fonts-helplabel": "ਮਦਦ" +} From 466f028bc2a51a82c0de2cbe7d4e324d999289f6 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 18 Nov 2024 13:10:30 +0100 Subject: [PATCH 3/5] Localisation updates from https://translatewiki.net. --- i18n/nl.json | 16 +++++++++++++++- i18n/pa.json | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/i18n/nl.json b/i18n/nl.json index 54ca2838..ce5aed52 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -3,12 +3,15 @@ "authors": [ "Gam3", "Mainframe98", + "McDutchie", "Nickthijssen1994", "RadioAzureus", "Romaine", "Siebrand" ] }, + "skinname-liberty": "Vrijheid", + "liberty-desc": "Responsieve vormgeving voor [https://librewiki.net/ LibreWiki]", "liberty-dark-default": "Niet negeren", "liberty-dark-dark": "Negeer en activeer de donkere modus", "liberty-dark-light": "Negeer en activeer de heldere modus", @@ -41,7 +44,10 @@ "prefs-color": "Kleurinstelling", "prefs-layout": "Lay-out instelling", "prefs-ads": "Advertentie instellingen", + "liberty-pref-layout-navfix": "Buiten statische navigatiebalk", + "liberty-pref-layout-sidebar": "Rechterzijbalk verwijderen", "liberty-pref-layout-width": "Vaste breedte", + "liberty-pref-layout-width-help": "Stel de maximale grootte van het documentgebied in", "liberty-pref-color-main": "Primaire kleur", "liberty-pref-color-main-help": "De primaire kleur die voor deze site gebruikt zal worden.", "liberty-pref-color-second": "Secundaire kleur", @@ -50,6 +56,14 @@ "liberty-pref-fonts": "Selecteer het te gebruiken lettertype", "liberty-pref-fonts-helplabel": "Hulp", "liberty-pref-fonts-help": "Het lettertype zal vanaf de servers van Google worden geladen, met uitzondering van het Malgun Gothic lettertype.", + "liberty-pref-dark": "Systeeminstellingen voor donkere modus negeren?", + "liberty-pref-dark-help": "Kies of de systeeminstellingen gevolgd moeten worden bij het activeren van de donkere modus.", "liberty-pref-ads-header": "Header advertenties verwijderen", - "liberty-pref-ads-right": "Rechter advertenties verwijderen" + "liberty-pref-ads-right": "Rechter advertenties verwijderen", + "liberty-pref-ads-bottom": "Advertenties onderaan verwijderen.", + "liberty-pref-ads-belowarticle": "Advertenties onder de artikelruimte verwijderen", + "right-blockads-header": "Kan kopadvertenties in de vormgeving Vrijheid verwijderen.", + "right-blockads-right": "Kan rechteradvertenties in de vormgeving Vrijheid verwijderen.", + "right-blockads-belowarticle": "Kan advertenties onder artikelen in de vormgeving Vrijheid verwijderen.", + "right-blockads-bottom": "Kan advertenties onderaan in de vormgeving Vrijheid verwijderen." } diff --git a/i18n/pa.json b/i18n/pa.json index 5c117228..b0bddddc 100644 --- a/i18n/pa.json +++ b/i18n/pa.json @@ -17,6 +17,7 @@ "liberty-info": "ਜਾਣਕਾਰੀ", "liberty-purge": "ਸਾਫ਼ ਕਰੋ", "liberty-recent-discussions": "ਹਾਲੀਆ ਚਰਚਾਵਾਂ", + "liberty-remember": "ਮੇਰਾ ਦਾਖ਼ਲਾ ਯਾਦ ਰੱਖੋ", "liberty-share": "ਸਾਂਝਾ ਕਰੋ", "liberty-tooltip-purge": "ਇਸ ਸਫ਼ੇ ਦੀ ਕੈਸ਼ ਨੂੰ ਸਾਫ਼ ਕਰੋ।", "liberty-view-more": "ਹੋਰ ਵੇਖੋ", From b87268365a554e2f00d938f49fa0845d67fae28a Mon Sep 17 00:00:00 2001 From: zlzleking Date: Mon, 25 Nov 2024 00:01:33 +0900 Subject: [PATCH 4/5] Fix github actions lint error - Fix eslint version to 8.x.x (mediawiki eslint config dosen't support eslint 9) - update php version to 8.2 on phpcs - update package.json and composer.json - add allow plugin on composer.json --- .github/workflows/lint.yml | 11 ++++++++--- composer.json | 10 ++++++++-- package.json | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d2301379..6a87ce38 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,13 +4,13 @@ on: [pull_request, push] jobs: phpcs: name: Run phpcs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' tools: composer:v2 - run: composer install @@ -22,5 +22,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: npm install --location=global eslint eslint-config-wikimedia eslint-plugin-json + + - uses: actions/setup-node@v3 + with: + node-version: 18.x + + - run: npm install --location=global eslint@^8.0.0 eslint-config-wikimedia eslint-plugin-json - run: eslint js --ignore-pattern 'lib/' diff --git a/composer.json b/composer.json index 19453375..5b2312c2 100644 --- a/composer.json +++ b/composer.json @@ -1,14 +1,20 @@ { "name": "librewiki/liberty-mw-skin", + "version": "1.13.8", "description": "Liberty MediaWiki Skin", "license": "GPL-3.0+", "require-dev": { "mediawiki/mediawiki-codesniffer": ">=0.9.0" }, - "scripts": { + "scripts": { "test": [ "phpcs -p -s" ], "fix": "phpcbf" + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 92af5506..10499ef7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "liberty-mw-skin", - "version": "1.6.6", + "version": "1.13.8", "description": "ESLint for Developers.", "main": "eslint.js", "scripts": { From 49525173faac4e2692aaf32b1ab369bbee33d633 Mon Sep 17 00:00:00 2001 From: zlzleking Date: Mon, 25 Nov 2024 00:08:38 +0900 Subject: [PATCH 5/5] fix phpcs --- LibertyTemplate.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/LibertyTemplate.php b/LibertyTemplate.php index 71cacc5e..01ba5b73 100644 --- a/LibertyTemplate.php +++ b/LibertyTemplate.php @@ -924,7 +924,7 @@ protected function parseNavbar() { foreach ( $split as $key => $value ) { $valueArr = explode( '=', trim( $value ) ); if ( isset( $valueArr[1] ) ) { - $newValue = implode( '=', array_slice($valueArr, 1)); + $newValue = implode( '=', array_slice( $valueArr, 1 ) ); $data[$valueArr[0]] = $newValue; } else { $data[$types[$key]] = trim( $value ); @@ -947,7 +947,9 @@ protected function parseNavbar() { if ( isset( $data['display'] ) ) { $textObj = $skin->msg( $data['display'] ); if ( $textObj->isDisabled() ) { - if( array_key_exists( 'link', $data ) ) $href = $data['link']; + if ( array_key_exists( 'link', $data ) ) { + $href = $data['link']; + } } else { $text = $textObj->text(); } @@ -969,7 +971,9 @@ protected function parseNavbar() { $title = $titleObj->text(); } } else { - if( isset( $text ) ) $title = $text; + if ( isset( $text ) ) { + $title = $text; + } } // Link href @@ -1001,7 +1005,7 @@ protected function parseNavbar() { } else { $classes = []; } - + // @codingStandardsIgnoreStart $item = [ 'access' => $access, 'classes' => $classes, @@ -1012,6 +1016,7 @@ protected function parseNavbar() { 'group' => $group, 'right' => $right ]; + // @codingStandardsIgnoreEnd $level2Children = &$item['children']; $headings[] = $item; continue; @@ -1248,7 +1253,7 @@ protected function buildAd( $position ) { * @param Content|null $content * @return string|null Textual form of the content, if available. */ - private function getContentText( Content $content = null ) { + private function getContentText( ?Content $content = null ) { if ( $content === null ) { return ''; }