Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/156188
Change subject: Merge remote-tracking branch 'origin/master' into HEAD
......................................................................
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
i18n/bg.json
i18n/ce.json
i18n/el.json
i18n/es.json
i18n/pl.json
i18n/tr.json
modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
Change-Id: I2d05ab71687121cf5daa1b97203c610784199775
---
M i18n/bg.json
M i18n/ce.json
M i18n/el.json
M i18n/es.json
M i18n/pl.json
M i18n/tr.json
M modules/ext.centralNotice.adminUi.bannerManager/bannermanager.css
M modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
M special/SpecialCentralNoticeBanners.php
9 files changed, 2 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/88/156188/1
diff --git a/i18n/bg.json b/i18n/bg.json
index aad2836..9e325f3 100644
--- a/i18n/bg.json
+++ b/i18n/bg.json
@@ -10,12 +10,8 @@
"Turin",
"Vladimir Penov",
"පසිඳු කාවින්ද",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
- "Gazimagomedov"
-=======
"Gazimagomedov",
"StanProg"
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
]
},
"centralnotice": "Администратор на централизираните съобщения",
@@ -92,7 +88,7 @@
"centralnotice-no-notices-exist": "Няма текущи кампании. Добавете
някоя.",
"centralnotice-no-templates-translate": "Няма шаблони, за които да се
редактират преводите",
"centralnotice-number-uses": "Използва",
- "centralnotice-settings": "Рекъезаби",
+ "centralnotice-settings": "Настройки",
"centralnotice-edit-template": "Редактиране на шаблон",
"centralnotice-edit-template-summary": "За да създадете локализируемо
съобщение, включете между тройките фигурни скоби низ от думи, свързани с
тирета, например {{{jimbo-quote}}}.",
"centralnotice-message": "Съобщение",
diff --git a/i18n/ce.json b/i18n/ce.json
index a567837..f2cbd63 100644
--- a/i18n/ce.json
+++ b/i18n/ce.json
@@ -78,10 +78,7 @@
"centralnotice-devicetype-iphone": "iPhone массо версеш",
"centralnotice-archive-banner-cancel": "Цаоьшу",
"centralnotice-change-summary-label": "Цунах лаьцна",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
-=======
"centralnotice-change-summary-prompt": "ХӀокху хийцамах лаьцна хаам
(тӀехь дац)",
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
"centralnotice-change-summary-action-prompt": "ХӀокху дечух лаьцна хаам
(тӀехь дац)",
"centralnotice-archive-campaign-cancel": "Цаоьшу",
"centralnotice-delete-banner": "ДӀаяккха",
diff --git a/i18n/el.json b/i18n/el.json
index a3f572e..98e543e 100644
--- a/i18n/el.json
+++ b/i18n/el.json
@@ -12,12 +12,8 @@
"Tifa93",
"ZaDiak",
"Απεργός",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
- "Geraki"
-=======
"Geraki",
"Nikosguard"
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
]
},
"centralnotice": "Διαχειριστής κεντρικών ειδοποιήσεων",
@@ -194,10 +190,7 @@
"centralnotice-archive-campaign-cancel": "Ακύρωση",
"centralnotice-delete-banner": "Διαγραφή",
"centralnotice-delete-banner-title": "Διαγραφή
{{PLURAL:$1|banner|banners}}",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
-=======
"centralnotice-delete-banner-confirm": "Προειδοποίηση: Η διαγραφή
αφαιρεί όλες τις ρυθμίσεις και τα μηνύματα. Αυτή η ενέργεια δεν μπορεί να
αντιστραφεί. Εξετάστε το ενδεχόμενο αρχειοθέτησης αντί της διαγραφής.",
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
"centralnotice-delete-banner-cancel": "Ακύρωση",
"centralnotice-messages-pending-approval": "Γλώσσες με μηνύματα σε
αναμονή έγκρισης επί του παρόντος",
"centralnotice-devices": "Εμφάνιση στις συσκευές",
diff --git a/i18n/es.json b/i18n/es.json
index b4a9785..5a3de37 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -23,12 +23,8 @@
"Sporeunai",
"Translationista",
"Vivaelcelta",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
- "Amitie 10g"
-=======
"Amitie 10g",
"Macofe"
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
]
},
"centralnotice": "Sistema de administración de avisos centralizados",
@@ -240,11 +236,7 @@
"centralnotice-archive-edit-prevented": "Las ediciones de esta campaña
están deshabilitadas porque está bloqueada o archivada. Cambie cualquier estado
desde [[Special:CentralNotice]].",
"centralnotice-add-new-banner-title": "Añadir un ''banner'' nuevo",
"centralnotice-delete-banner": "Eliminar",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
- "centralnotice-delete-banner-title": "Borrar
{{PLURAL:$1|pancarta|pancartas}}?",
-=======
"centralnotice-delete-banner-title": "¿Borrar
{{PLURAL:$1|pancarta|pancartas}}?",
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
"centralnotice-delete-banner-confirm": "Atención: esto eliminará toda
la configuración y los mensajes. Esta acción no se puede deshacer. Considera
archivar los elementos en su lugar.",
"centralnotice-delete-banner-cancel": "Cancelar",
"centralnotice-messages-pending-approval": "Lenguajes con mensajes
esperando aprobación",
diff --git a/i18n/pl.json b/i18n/pl.json
index 2f56936..12a0c79 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -199,19 +199,13 @@
"centralnotice-archive-banner-title": "Zarchiwizować
{{PLURAL:$1|baner|banery}}?",
"centralnotice-archive-banner-cancel": "Anuluj",
"centralnotice-change-summary-label": "Podsumowanie",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
-=======
"centralnotice-change-summary-prompt": "Wiadomość o tych zmianach
(opcjonalnie)",
"centralnotice-change-summary-action-prompt": "Wiadomość o tej akcji
(opcjonalnie)",
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
"centralnotice-archive-campaign-cancel": "Anuluj",
"centralnotice-add-new-banner-title": "Dodaj nowy baner",
"centralnotice-delete-banner": "Usuń",
"centralnotice-delete-banner-title": "Usunąć
{{PLURAL:$1|baner|banery}}?",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
-=======
"centralnotice-delete-banner-confirm": "Ostrzeżenie: Usunięcie kasuje
wszystkie ustawienia i wiadomości. Tej czynności nie można cofnąć. Pomyśl o
użyciu archiwizacji zamiast kasowaniu.",
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
"centralnotice-delete-banner-cancel": "Anuluj",
"centralnotice-start-timestamp": "Rozpoczęcie (UTC)",
"centralnotice-end-timestamp": "Zakończenie (UTC)",
diff --git a/i18n/tr.json b/i18n/tr.json
index d79961d..f694e8d 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -10,12 +10,8 @@
"Srhat",
"Suelnur",
"Szoszv",
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
- "Sayginer"
-=======
"Sayginer",
"Sucsuzz"
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
]
},
"centralnotice": "Merkezi uyarı yöneticisi",
diff --git a/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.css
b/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.css
index b2bca92..4d7246f 100644
--- a/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.css
+++ b/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.css
@@ -81,4 +81,4 @@
}
.ui-dialog-content legend {
display: none;
-}
+}
\ No newline at end of file
diff --git a/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
b/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
index 41fb357..d5200e5 100644
--- a/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
+++ b/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
@@ -103,18 +103,6 @@
};
buttons[ cancelButtonText ] = function() { $( this
).dialog( "close" ); };
-<<<<<<< HEAD (4ae59a Localisation updates from https://translatewiki.net.)
- dialogObj.text( mw.message(
'centralnotice-delete-banner-confirm' ).text() );
- dialogObj.dialog({
- title: mw.message(
- 'centralnotice-delete-banner-title',
- bm.selectedItemCount
- ).text(),
- resizable: false,
- modal: true,
- buttons: buttons
- });
-=======
dialogObj.append( dialogMessage );
dialogMessage.text( mw.message(
'centralnotice-delete-banner-confirm' ).text() );
@@ -128,7 +116,6 @@
modal: true,
buttons: buttons
});
->>>>>>> BRANCH (be8758 Localisation updates from https://translatewiki.net.)
},
/**
diff --git a/special/SpecialCentralNoticeBanners.php
b/special/SpecialCentralNoticeBanners.php
index 7eb14ef..550b5e7 100644
--- a/special/SpecialCentralNoticeBanners.php
+++ b/special/SpecialCentralNoticeBanners.php
@@ -352,39 +352,6 @@
}
/**
- * Use a URL parameter to set the filter string for the banner list.
- */
- protected function setFilterFromUrl() {
-
- // This is the normal param on visible URLs.
- $filterParam = $this->getRequest()->getVal( 'filter', null );
-
- // If the form was posted the filter parameter'll have a
different name.
- if ( $filterParam === null ) {
- $filterParam =
- $this->getRequest()->getVal(
'wpbannerNameFilter', null );
- }
-
- // Clean, clean...
- if ( $filterParam !== null ) {
- $this->bannerFilterString
- = static::sanitizeSearchTerms( $filterParam );
- }
- }
-
- /**
- * Return an array for use in constructing a URL query part with or
without
- * a filter parameter, as required.
- *
- * @return array
- */
- public function getFilterUrlParamAsArray() {
-
- return $this->bannerFilterString ?
- array( 'filter' => $this->bannerFilterString ) :
array();
- }
-
- /**
* Display the banner editor and process edits
*/
protected function showBannerEditor() {
--
To view, visit https://gerrit.wikimedia.org/r/156188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d05ab71687121cf5daa1b97203c610784199775
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
