Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146428
Change subject: Implemented changes for translatewiki
......................................................................
Implemented changes for translatewiki
Moved php i18n file to languages folder
Moved to Json i18n files
Change-Id: Ia3d4fa898721eac7b9d8752019884fdf30748aa7
---
M NamespaceManager/NamespaceManager.class.php
M NamespaceManager/NamespaceManager.setup.php
A NamespaceManager/includes/NamespaceNuker.php
A NamespaceManager/languages/NamespaceManager.i18n.php
M NamespaceManager/resources/BS.NamespaceManager/NamespaceDialog.js
M NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
M NamespaceManager/resources/BS.NamespaceManager/Panel.js
7 files changed, 380 insertions(+), 53 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/28/146428/1
diff --git a/NamespaceManager/NamespaceManager.class.php
b/NamespaceManager/NamespaceManager.class.php
index c2261c8..d20a0ab 100644
--- a/NamespaceManager/NamespaceManager.class.php
+++ b/NamespaceManager/NamespaceManager.class.php
@@ -401,13 +401,13 @@
if ( strlen( $sNamespace ) < 2 ) {
return FormatJson::encode( array(
'success' => false,
- 'message' => wfMessage(
'bs-namespacemanager-namespace_name_length' )->plain()
+ 'message' => wfMessage(
'bs-namespacemanager-ns-length' )->plain()
) );
// TODO MRG (06.11.13 11:17): Unicodefähigkeit?
} else if ( !preg_match(
'%^[a-zA-Z_\\x80-\\xFF][a-zA-Z0-9_\\x80-\\xFF]{1,99}$%i', $sNamespace ) ) {
return FormatJson::encode( array(
'success' => false,
- 'message' => wfMessage(
'bs-namespacemanager-wrong_namespace_name_format' )->plain()
+ 'message' => wfMessage(
'bs-namespacemanager-wrong-name' )->plain()
) );
} else {
$aUserNamespaces[$iNS] = array( 'name' =>
$sNamespace );
@@ -432,7 +432,7 @@
// Zweig hier weglassen.
return FormatJson::encode( array(
'success' => false,
- 'message' => wfMessage(
'bs-namespacemanager-namespace_already_exists' )->plain()
+ 'message' => wfMessage(
'bs-namespacemanager-ns-exists' )->plain()
) );
}
}
@@ -460,19 +460,19 @@
if ( $iNS !== NS_MAIN && !$iNS ) {
return FormatJson::encode( array(
'success' => false,
- 'message' => wfMessage(
'bs-namespacemanager-no_valid_namespace_id' )->plain()
+ 'message' => wfMessage(
'bs-namespacemanager-invalid-id' )->plain()
) );
}
if ( strlen( $sNamespace ) < 2 ) {
return FormatJson::encode( array(
'success' => false,
- 'message' => wfMessage(
'bs-namespacemanager-namespace_name_length' )->plain()
+ 'message' => wfMessage(
'bs-namespacemanager-ns-length' )->plain()
) );
}
if ( $iNS !== NS_MAIN && $iNS !== NS_PROJECT && $iNS !==
NS_PROJECT_TALK && !preg_match(
'%^[a-zA-Z_\\x80-\\xFF][a-zA-Z0-9_\\x80-\\xFF]{1,99}$%', $sNamespace ) ) {
return FormatJson::encode( array(
'success' => false,
- 'message' => wfMessage(
'bs-namespacemanager-wrong_namespace_name_format' )->plain()
+ 'message' => wfMessage(
'bs-namespacemanager-wrong-name' )->plain()
) );
}
@@ -518,7 +518,7 @@
if ( !$iNS ) {
return FormatJson::encode( array(
'success' => false,
- 'message' => wfMessage(
'bs-namespacemanager-no_valid_namespace_id' )->plain()
+ 'message' => wfMessage(
'bs-namespacemanager-invalid-id' )->plain()
) );
}
diff --git a/NamespaceManager/NamespaceManager.setup.php
b/NamespaceManager/NamespaceManager.setup.php
index 15a394f..7bec4b2 100644
--- a/NamespaceManager/NamespaceManager.setup.php
+++ b/NamespaceManager/NamespaceManager.setup.php
@@ -1,55 +1,34 @@
<?php
-BsExtensionManager::registerExtension('NamespaceManager',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
+BsExtensionManager::registerExtension('NamespaceManager',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
+
+#$wgMessagesDirs['NamespaceManager'] = __DIR__ . '/i18n';
+
+$wgExtensionMessagesFiles['NamespaceManager'] = __DIR__ .
'/languages/NamespaceManager.i18n.php';
$wgResourceModules['ext.bluespice.namespaceManager'] = array(
'scripts' =>
'extensions/BlueSpiceExtensions/NamespaceManager/resources/bluespice.namespaceManager.js',
'styles' =>
'extensions/BlueSpiceExtensions/NamespaceManager/resources/bluespice.namespaceManager.namespaceManagerTreeview.css',
'dependencies' => 'ext.bluespice.extjs',
'messages' => array(
- 'bs-namespacemanager-headerNamespaceId',
- 'bs-namespacemanager-headerNamespaceName',
- 'bs-namespacemanager-headerIsUserNamespace',
- 'bs-namespacemanager-headerIsContentNamespace',
- 'bs-namespacemanager-headerIsSearchableNamespace',
- 'bs-namespacemanager-headerIsSubpagesNamespace',
- 'bs-namespacemanager-headerActions',
- 'bs-namespacemanager-yes',
- 'bs-namespacemanager-no',
- 'bs-namespacemanager-btnAddNamespace',
- 'bs-namespacemanager-tipEdit',
- 'bs-namespacemanager-tipRemove',
- 'bs-namespacemanager-msgNotEditable',
- 'bs-namespacemanager-msgNotEditableDelete',
- 'bs-namespacemanager-titleNewNamespace',
- 'bs-namespacemanager-labelNamespaceName',
- 'bs-namespacemanager-emptyMsgNamespaceName',
- 'bs-namespacemanager-labelContentNamespace',
- 'bs-namespacemanager-labelSearchedNamespace',
- 'bs-namespacemanager-labelSubpagesNamespace',
- 'bs-namespacemanager-btnSave',
- 'bs-namespacemanager-btnCancel',
- 'bs-namespacemanager-titleError',
- 'bs-namespacemanager-willDelete',
- 'bs-namespacemanager-willMove',
- 'bs-namespacemanager-willMoveSuffix',
+ 'bs-namespacemanager-tipadd',
+ 'bs-namespacemanager-tipedit',
+ 'bs-namespacemanager-tipremove',
+ 'bs-namespacemanager-msgnoteditabledelete',
+ 'bs-namespacemanager-labelnsname',
+ 'bs-namespacemanager-willdelete',
+ 'bs-namespacemanager-willmove',
+ 'bs-namespacemanager-willmovesuffix',
'bs-namespacemanager-deletewarning',
- 'bs-namespacemanager-moveConflict',
- 'bs-namespacemanager-articlesPresent',
- 'bs-namespacemanager-btnDelete',
- 'bs-namespacemanager-deleteNamespace',
- 'bs-namespacemanager-showEntries',
- 'bs-namespacemanager-pageSize',
+ 'bs-namespacemanager-pagepresent',
'bs-namespacemanager-label-editable'
),
'localBasePath' => $IP,
'remoteBasePath' => &$GLOBALS['wgScriptPath']
);
-$wgExtensionMessagesFiles['NamespaceManager'] = __DIR__ .
'/NamespaceManager.i18n.php';
-
$GLOBALS['wgAutoloadClasses']['NamespaceManager'] = __DIR__ .
'/NamespaceManager.class.php';
-$wgAutoloadClasses['NamespaceNuker'] = __DIR__ . '/NamespaceNuker.php';
+$wgAutoloadClasses['NamespaceNuker'] = __DIR__ .
'/includes/NamespaceNuker.php';
$wgAjaxExportList[] = 'NamespaceManager::getForm';
$wgAjaxExportList[] = 'NamespaceManager::getData';
diff --git a/NamespaceManager/includes/NamespaceNuker.php
b/NamespaceManager/includes/NamespaceNuker.php
new file mode 100644
index 0000000..4fb21cd
--- /dev/null
+++ b/NamespaceManager/includes/NamespaceNuker.php
@@ -0,0 +1,236 @@
+<?php
+
+/**
+ * NamespacerNuker
+ * @author Sebastian Ulbricht
+ */
+// Last review MRG (01.07.11 01:47)
+class NamespaceNuker {
+
+ protected static function PurgeRedundantText() {
+ global $wgDBtype;
+ $dbw = wfGetDB(DB_MASTER);
+ $dbw->begin();
+
+ $tbl_arc = $dbw->tableName('archive');
+ $tbl_rev = $dbw->tableName('revision');
+ $tbl_txt = $dbw->tableName('text');
+
+ # Get "active" text records from the revisions table
+ $res = $dbw->query("SELECT DISTINCT rev_text_id FROM $tbl_rev");
+ while ($row = $dbw->fetchObject($res)) {
+ $cur[] = $row->rev_text_id;
+ }
+
+ # Get "active" text records from the archive table
+ $res = $dbw->query("SELECT DISTINCT ar_text_id FROM $tbl_arc");
+ while ($row = $dbw->fetchObject($res)) {
+ $cur[] = $row->ar_text_id;
+ }
+
+ # Get the IDs of all text records not in these sets
+ $set = implode(', ', $cur);
+ $res = $dbw->query("SELECT old_id FROM $tbl_txt WHERE old_id
NOT IN ( $set )");
+ $old = array();
+ while ($row = $dbw->fetchObject($res)) {
+ $old[] = $row->old_id;
+ }
+ if (count($old)) {
+ $set = implode(', ', $old);
+
+ $tbl_txt_bck = $wgDBtype == 'oracle' ?
$dbw->tableName('bs_ns_bak_text') :
$dbw->tableName('bs_namespacemanager_backup_text');
+ $dbw->query("INSERT INTO $tbl_txt_bck SELECT * FROM
$tbl_txt WHERE old_id IN ($set)");
+ $dbw->query("DELETE FROM $tbl_txt WHERE old_id IN (
$set )");
+ }
+
+ $dbw->commit();
+ }
+
+ protected static function DeleteRevisions($revs) {
+ global $wgDBtype;
+ $dbw = wfGetDB(DB_MASTER);
+ $dbw->begin();
+ $tbl_rev = $dbw->tableName('revision');
+ if (count($revs)) {
+ $set = implode(', ', $revs);
+ $tbl_rev_bck = $wgDBtype == 'oracle' ?
$dbw->tableName('bs_ns_bak_revision') :
$dbw->tableName('bs_namespacemanager_backup_revision');
+ $dbw->query("INSERT INTO $tbl_rev_bck SELECT * FROM
$tbl_rev WHERE rev_id IN ( $set )");
+ $dbw->query("DELETE FROM $tbl_rev WHERE rev_id IN (
$set )");
+ }
+ $dbw->commit();
+ }
+
+ public static function removeAllPages($idNS, $nameNS, $toNS = 0) {
+ global $wgDBtype;
+ if (!$idNS)
+ return false;
+ $bnUser = RequestContext::getMain()->getUser();
+ $idUser = $bnUser->getId();
+ $nameUser = $bnUser->getName();
+
+ $dbw = wfgetDB(DB_MASTER);
+ $dbw->begin();
+ $tbl_pag = $dbw->tableName('page');
+ $tbl_rec_chg = $dbw->tableName('recentchanges');
+ $idNS = $dbw->addQuotes($idNS);
+ $pages = array();
+ $info = array();
+ $renamed = 0;
+
+ $res = $dbw->query("SELECT page_id, page_title, page_len,
page_latest " .
+ "FROM $tbl_pag " .
+ "WHERE page_namespace = $idNS");
+ while ($row = $dbw->fetchObject($res)) {
+ $pages[] = $row->page_title;
+ $info[$row->page_title] = array('page_title' =>
$row->page_title,
+ 'page_id' => $row->page_id,
+ 'last_id' => $row->page_latest,
+ 'page_len' => $row->page_len);
+ }
+ if (count($pages)) {
+ $set = implode('\', \'', $pages);
+ $res = $dbw->query("SELECT page_title " .
+ "FROM $tbl_pag " .
+ "WHERE page_namespace =
0 " .
+ " AND page_title IN
('$set')");
+ $pages = array();
+ while ($row = $dbw->fetchObject($res)) {
+ $pages[] = $row->page_title;
+ $info[$row->page_title]['page_title'] =
$row->page_title . "_(from_$nameNS)";
+ }
+ if (count($pages)) {
+ $set = implode('\', \'', $pages);
+ $dbw->query("UPDATE $tbl_pag " .
+ "SET page_title =
CONCAT(page_title, '_(from_$nameNS)') " .
+ "WHERE page_namespace = $idNS "
.
+ " AND page_title IN ('$set')");
+ $renamed = $set;
+ }
+ if ($wgDBtype == 'postgres') {
+ $time = wfTimestamp(TS_POSTGRES, time());
+ } else {
+ $time = date("YmdHis", time());
+ }
+ foreach ($info as $page) {
+ $dbw->query("INSERT INTO $tbl_rec_chg " .
+ "(rc_timestamp, rc_cur_time,
rc_user, rc_user_text, rc_namespace, rc_title, rc_comment, rc_minor ,rc_bot,
rc_new, rc_cur_id, rc_this_oldid, " .
+ "rc_last_oldid, rc_type,
rc_moved_to_ns, rc_patrolled, rc_ip, rc_old_len, rc_new_len, rc_deleted,
rc_logid, rc_log_type) VALUES " .
+ "('$time', '$time', '$idUser',
'$nameUser', $idNS, '" . $page['page_title'] . "', " .
+ // TODO SU (04.07.11 12:05):
i18n
+ "'Diese Seite wurde vom
Namespace \"$nameNS\" in den Mainspace verschoben, da der Namespace \"$nameNS\"
gelöscht wurde.', " .
+ "0, 0, 0, " . $page['page_id']
. ", " . $page['last_id'] . ", 0, 3, 0, 0, '" . $_SERVER['REMOTE_ADDR'] . "', "
. $page['page_len'] . ", " .
+ $page['page_len'] . ", 0, 0,
'move')");
+ }
+ }
+ $dbw->query("UPDATE $tbl_pag " .
+ "SET page_namespace = $toNS " .
+ "WHERE page_namespace = $idNS");
+ $dbw->query("UPDATE $tbl_rec_chg " .
+ "SET rc_namespace = $toNS " .
+ "WHERE rc_namespace = $idNS");
+ $dbw->commit();
+
+ if ($renamed != 0) {
+ return $renamed;
+ }
+ return true;
+ }
+
+ public static function removeAllPagesWithSuffix($idNS, $nameNS, $toNS =
0) {
+ if (!$idNS) {
+ return false;
+ }
+
+ $dbw = wfgetDB(DB_MASTER);
+ $dbw->begin();
+ $tbl_pag = $dbw->tableName('page');
+ $tbl_rec_chg = $dbw->tableName('recentchanges');
+
+ $res = $dbw->query("SELECT page_id, page_title, page_len,
page_latest " .
+ "FROM $tbl_pag " .
+ "WHERE page_namespace = $idNS");
+ $info = array();
+ while ($row = $dbw->fetchObject($res)) {
+ $info[$row_ > page_title] = array('page_title' =>
$row->page_title . "_(from_$nameNS)",
+ 'page_id' => $row->page_id,
+ 'last_id' => $row->page_latest,
+ 'page_len' => $row->page_len);
+ }
+ if ($wgDBtype == 'postgres') {
+ $time = wfTimestamp(TS_POSTGRES, time());
+ } else {
+ $time = date("YmdHis", time());
+ }
+ foreach ($info as $page) {
+ $dbw->query("INSERT INTO $tbl_rec_chg " .
+ "(rc_timestamp, rc_cur_time, rc_user,
rc_user_text, rc_namespace, rc_title, rc_comment, rc_minor ,rc_bot, rc_new,
rc_cur_id, rc_this_oldid, " .
+ "rc_last_oldid, rc_type,
rc_moved_to_ns, rc_patrolled, rc_ip, rc_old_len, rc_new_len, rc_deleted,
rc_logid, rc_log_type) VALUES " .
+ "('$time', '$time', '$idUser',
'$nameUser', $idNS, '" . $page['page_title'] . "', " .
+ // TODO SU (04.07.11 12:05): i18n
+ "'Diese Seite wurde vom Namespace
\"$nameNS\" in den Mainspace verschoben, da der Namespace \"$nameNS\" gelöscht
wurde.', " .
+ "0, 0, 0, " . $page['page_id'] . ", " .
$page['last_id'] . ", 0, 3, 0, 0, '" . $_SERVER['REMOTE_ADDR'] . "', " .
$page['page_len'] . ", " .
+ $page['page_len'] . ", 0, 0, 'move')");
+ }
+
+ $dbw->query("UPDATE $tbl_pag " .
+ "SET page_title = CONCAT(page_title,
'_(from_$nameNS)'), " .
+ " page_namespace = $toNS " .
+ "WHERE page_namespace = $idNS");
+ $dbw->query("UPDATE $tbl_rec_chg " .
+ "SET rc_namespace = $toNS " .
+ "WHERE rc_namespace = $idNS");
+
+ $dbw->commit();
+ return true;
+ }
+
+ public static function nukeNamespaceWithAllPages($idNS) {
+ global $wgDBtype;
+ if (!$idNS) {
+ return false;
+ }
+ $dbw = wfgetDB(DB_MASTER);
+ $dbw->begin();
+
+ $tbl_pag = $dbw->tableName('page');
+ $tbl_rev = $dbw->tableName('revision');
+ $tbl_pag_bck = $wgDBtype == 'oracle' ?
$dbw->tableName('bs_ns_bak_page') :
$dbw->tableName('bs_namespacemanager_backup_page');
+ $tbl_rec_chg = $dbw->tableName('recentchanges');
+ $tbl_src_idx = $dbw->tableName('searchindex');
+ $res = $dbw->query("SELECT page_title FROM $tbl_pag WHERE
page_namespace = $idNS");
+ $i_deleted = 0;
+
+ while ($row = $dbw->fetchObject($res)) {
+ $title = Title::newFromText($row->page_title, $idNS);
+ $id = $title->getArticleID();
+
+ // Get corresponding revisions
+ $res2 = $dbw->query("SELECT rev_id FROM $tbl_rev WHERE
rev_page = $id");
+ $revs = array();
+ while ($row2 = $dbw->fetchObject($res2)) {
+ $revs[] = $row2->rev_id;
+ }
+ $dbw->query("INSERT INTO $tbl_pag_bck SELECT * FROM
$tbl_pag WHERE page_id = $id");
+ // Delete revisions as appropriate
+ self::DeleteRevisions($revs);
+ $dbw->query("DELETE FROM $tbl_pag WHERE page_id = $id");
+ $dbw->query("DELETE FROM $tbl_src_idx WHERE si_page =
$id");
+
+ $i_deleted++;
+ }
+ self::PurgeRedundantText(true);
+ $dbw->query("DELETE FROM $tbl_rec_chg WHERE rc_namespace =
$idNS");
+ $dbw->commit();
+ if ($i_deleted > 0) {
+ $res = $dbw->query("SELECT COUNT(*) AS pages FROM
$tbl_pag");
+ $row = $dbw->fetchObject($res);
+ $pages = $row->pages;
+ $dbw->update(
+ 'site_stats', array('ss_total_pages' =>
$pages), array('ss_row_id' => 1), __METHOD__
+ );
+ }
+
+ return true;
+ }
+
+}
\ No newline at end of file
diff --git a/NamespaceManager/languages/NamespaceManager.i18n.php
b/NamespaceManager/languages/NamespaceManager.i18n.php
new file mode 100644
index 0000000..e9566b8
--- /dev/null
+++ b/NamespaceManager/languages/NamespaceManager.i18n.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Internationalisation file for NamespaceManager
+ *
+ * Part of BlueSpice for MediaWiki
+ *
+ * @author Stephan Muggli <[email protected]>
+ * @version $Id' =>NamespaceManager.i18n.php 6401 2012-09-06 11:03:08Z
smuggli $
+ * @package BlueSpice_Extensions
+ * @subpackage NamespaceManager
+ * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
+ * @filesource
+ */
+
+$messages = array();
+
+$messages['de'] = array(
+ 'bs-namespacemanager-desc' => 'Administrationsoberfläche zum
Erstellen und Bearbeiten von Rechten',
+ 'bs-namespacemanager-label' =>
'Namensraumverwaltung',
+ 'bs-namespacemanager-wrong-name' => 'Der von Dir gewählte Namesraum
enthält unzulässige Zeichen.',
+ 'bs-namespacemanager-ns-exists' => 'Der von Dir gewählte Namesraum
existiert bereits.',
+ 'bs-namespacemanager-ns-length' => 'Der von Dir eingetragene
Namesraum muss minderstens zwei Zeichen lang sein.',
+ 'bs-namespacemanager-invalid-id' => 'Keine zulässige Namesraum ID
übertragen.',
+ 'bs-namespacemanager-label-id' => 'ID',
+ 'bs-namespacemanager-label-namespaces' => 'Namesraum',
+ 'bs-namespacemanager-label-editable' => 'Umbenennbar',
+ 'bs-namespacemanager-label-content' => 'In Statistik',
+ 'bs-namespacemanager-label-searchable' => 'Standardmäßig
durchsuchen',
+ 'bs-namespacemanager-label-subpages' => 'Unterseiten',
+ 'bs-namespacemanager-nsadded' => 'Der Namesraum
wurde erstellt.',
+ 'bs-namespacemanager-nsremoved' => 'Der Namesraum
wurde gelöscht.',
+ 'bs-namespacemanager-nsremoved' => 'Der Namensraum
wurde bearbeitet.',
+ 'bs-namespacemanager-tipadd' =>'Namensraum hinzufügen',
+ 'bs-namespacemanager-tipedit' =>'Namensraum bearbeiten',
+ 'bs-namespacemanager-tipremove' =>'Namensraum entfernen',
+ 'bs-namespacemanager-labelnsname' =>'Namensraum-Name',
+ 'bs-namespacemanager-willdelete' =>'Werden gelöscht',
+ 'bs-namespacemanager-willmove' =>'Werden in (Seiten) verschoben*',
+ 'bs-namespacemanager-willmovesuffix' =>'Werden mit dem Suffix "(Von
$1)" in {{int:bs-ns_main}} verschoben',
+ 'bs-namespacemanager-deletewarning' =>'Bist du dir sicher, dass du den
Namensraum löschen willst? Das Löschen eines Namensraums kann nicht rückgängig
gemacht werden.',
+ 'bs-namespacemanager-pagepresent' =>'Seiten in diesem Namensraum:'
+);
+
+$messages['de-formal'] = array(
+ 'bs-namespacemanager-wrong-name' => 'Der von Ihnen gewählte Namensraum
enthält unzulässige Zeichen.',
+ 'bs-namespacemanager-ns-exists' => 'Der von Ihnen gewählte
Namensraum existiert bereits.',
+ 'bs-namespacemanager-ns-length' => 'Der von Ihnen eingetragene
Namensraum muss minderstens zwei Zeichen lang sein.',
+);
+
+$messages['en'] = array(
+ 'bs-namespacemanager-desc' => 'Administration interface for
managing namespaces',
+ 'bs-namespacemanager-label' => 'Namespace
manager',
+ 'bs-namespacemanager-wrong-name' => 'The namespace contains invalid
characters.',
+ 'bs-namespacemanager-ns-exists' => 'The namespace already exists.',
+ 'bs-namespacemanager-ns-length' => 'The namespace must have a
length of two characters.',
+ 'bs-namespacemanager-invalid-id' => 'No valid namespace ID',
+ 'bs-namespacemanager-label-id' => 'ID',
+ 'bs-namespacemanager-label-namespaces' => 'Namespace',
+ 'bs-namespacemanager-label-editable' => 'Renamable',
+ 'bs-namespacemanager-label-content' => 'In statistics',
+ 'bs-namespacemanager-label-searchable' => 'Search by
default',
+ 'bs-namespacemanager-label-subpages' => 'Subpages',
+ 'bs-namespacemanager-nsadded' => 'The namespace has
been added.',
+ 'bs-namespacemanager-nsremoved' => 'The namespace has
been removed.',
+ 'bs-namespacemanager-nsedited' => 'The namespace has
been edited.',
+ 'bs-namespacemanager-tipadd' => 'Add namespace',
+ 'bs-namespacemanager-tipedit' => 'Edit namespace',
+ 'bs-namespacemanager-tipremove' => 'Remove namespace',
+ 'bs-namespacemanager-msgnoteditabledelete' => 'This namespace is a
system namespace and cannot be deleted.',
+ 'bs-namespacemanager-labelnsname' => 'Namespace name',
+ 'bs-namespacemanager-willdelete' => 'Will be deleted',
+ 'bs-namespacemanager-willmove' => 'Will be moved into
{{int:bs-ns_main}}',
+ 'bs-namespacemanager-willmovesuffix' => 'Will be moved into
{{int:bs-ns_main}} with the Suffix "(from $1)"',
+ 'bs-namespacemanager-deletewarning' => 'Are you sure that you want to
delete this namespace? Deleting a namespace cannot be undone.',
+ 'bs-namespacemanager-pagepresent' => 'Pages in this namespace:'
+);
+
+$messages['qqq'] = array(
+ 'bs-namespacemanager-desc' => 'Used in
[[Special:Wiki_Admin&mode=ExtensionInfo]], description of namespace manager
extension',
+ 'bs-namespacemanager-label' => 'Used in Sidebar,
Anchor text for namespace manager',
+ 'bs-namespacemanager-wrong-name' => 'Error message for the namespace
contains invalid characters.',
+ 'bs-namespacemanager-ns-exists' => 'Error message for the namespace
already exists.',
+ 'bs-namespacemanager-ns-length' => 'Error message for the
namespace must have a length of two characters.',
+ 'bs-namespacemanager-invalid-id' => 'Error message for no valid
namespace ID',
+ 'bs-namespacemanager-label-id' => 'Column headline
for id',
+ 'bs-namespacemanager-label-namespaces' => 'Column headline
for namespace',
+ 'bs-namespacemanager-label-editable' => 'Column headline
for renamable',
+ 'bs-namespacemanager-label-content' => 'Column headline
for in statistics',
+ 'bs-namespacemanager-label-searchable' => 'Column headline
for search by default',
+ 'bs-namespacemanager-label-subpages' => 'Column headline
for subpages',
+ 'bs-namespacemanager-nsadded' => 'Success message
for the namespace has been added.',
+ 'bs-namespacemanager-nsremoved' => 'Success message
for the namespace has been removed.',
+ 'bs-namespacemanager-nsedited' => 'Success message
for the namespace has been edited.',
+ 'bs-namespacemanager-tipadd' => 'Window title for add namespace',
+ 'bs-namespacemanager-tipedit' => 'Window title for edit namespace',
+ 'bs-namespacemanager-tipremove' => 'Window title for remove namespace',
+ 'bs-namespacemanager-msgnoteditabledelete' => 'Error message for this
namespace is a system namespace and cannot be deleted.',
+ 'bs-namespacemanager-labelnsname' => 'Label for name',
+ 'bs-namespacemanager-willdelete' => 'Checkbox label for will be
deleted',
+ 'bs-namespacemanager-willmove' => 'Checkbox label for will be moved
into {{int:bs-ns_main}}',
+ 'bs-namespacemanager-willmovesuffix' => 'Checkbox label for will be
moved into {{int:bs-ns_main}} with the Suffix "(from $1)"\n$1 is the namespace
name of the namespace which will be deleted',
+ 'bs-namespacemanager-deletewarning' => 'Text for are you sure that you
want to delete this namespace? Deleting a namespace cannot be undone.',
+ 'bs-namespacemanager-pagepresent' => 'Headline for pages in this
namespace:\nHeadline for checkbox section'
+);
\ No newline at end of file
diff --git a/NamespaceManager/resources/BS.NamespaceManager/NamespaceDialog.js
b/NamespaceManager/resources/BS.NamespaceManager/NamespaceDialog.js
index d7c88b6..8cf4167 100644
--- a/NamespaceManager/resources/BS.NamespaceManager/NamespaceDialog.js
+++ b/NamespaceManager/resources/BS.NamespaceManager/NamespaceDialog.js
@@ -18,7 +18,7 @@
selectedData: {},
afterInitComponent: function() {
this.tfNamespaceName = Ext.create( 'Ext.form.TextField', {
- fieldLabel: mw.message(
'bs-namespacemanager-labelNamespaceName' ).plain(),
+ fieldLabel: mw.message(
'bs-namespacemanager-labelnsname' ).plain(),
labelWidth: 130,
labelAlign: 'right',
name: 'namespacename',
diff --git
a/NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
b/NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
index 6e4f4c6..189e3f2 100644
--- a/NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
+++ b/NamespaceManager/resources/BS.NamespaceManager/NamespaceRemoveDialog.js
@@ -23,16 +23,16 @@
columns: 1,
vertical: true,
items: [
- { boxLabel:
mw.message('bs-namespacemanager-willDelete').plain(), name: 'rb', inputValue:
'0' },
- { boxLabel:
mw.message('bs-namespacemanager-willMove').plain(), name: 'rb', inputValue: '1'
},
- { boxLabel:
mw.message('bs-namespacemanager-willMoveSuffix').plain(), name: 'rb',
inputValue: '2' }
+ { boxLabel:
mw.message('bs-namespacemanager-willdelete').plain(), name: 'rb', inputValue:
'0' },
+ { boxLabel:
mw.message('bs-namespacemanager-willmove').plain(), name: 'rb', inputValue: '1'
},
+ { boxLabel:
mw.message('bs-namespacemanager-willmovesuffix', this.nsName).plain(), name:
'rb', inputValue: '2' }
]
});
this.items = [{
html: mw.message(
'bs-namespacemanager-deletewarning' ).plain()
}, {
- html: mw.message(
'bs-namespacemanager-articlesPresent' ).plain()
+ html: mw.message(
'bs-namespacemanager-pagepresent' ).plain()
},
this.rgNamespacenuker
];
diff --git a/NamespaceManager/resources/BS.NamespaceManager/Panel.js
b/NamespaceManager/resources/BS.NamespaceManager/Panel.js
index 7a332ef..33751a4 100644
--- a/NamespaceManager/resources/BS.NamespaceManager/Panel.js
+++ b/NamespaceManager/resources/BS.NamespaceManager/Panel.js
@@ -84,7 +84,7 @@
//TODO: not nice. Decision on wether is "add" or "edit" shold
be made
//by the dialog depending on the provided ID. I.e. -1 for "add"
this.active = 'add';
- this.dlgNamespaceAdd.setTitle( mw.message(
'bs-namespacemanager-btnAddNamespace' ).plain() );
+ this.dlgNamespaceAdd.setTitle( mw.message(
'bs-namespacemanager-tipadd' ).plain() );
this.dlgNamespaceAdd.show();
this.callParent( arguments );
},
@@ -96,30 +96,37 @@
}
this.active = 'edit';
- this.dlgNamespaceEdit.setTitle( mw.message(
'bs-namespacemanager-tipEdit' ).plain() );
+ this.dlgNamespaceEdit.setTitle( mw.message(
'bs-namespacemanager-tipedit' ).plain() );
this.dlgNamespaceEdit.setData( selectedRow[0].getData() );
this.dlgNamespaceEdit.show();
this.callParent( arguments );
},
onBtnRemoveClick: function( oButton, oEvent ) {
+ debugger;
var selectedRow =
this.grdMain.getSelectionModel().getSelection();
var editable = selectedRow[0].get( 'editable' );
if ( editable === false ) {
bs.util.alert(
'NMfail',
{
- textMsg:
'bs-namespacemanager-msgNotEditableDelete',
+ textMsg:
'bs-namespacemanager-msgnoteditabledelete',
titleMsg: 'bs-extjs-title-warning'
}
);
return;
}
if ( !this.dlgNamespaceRemove ) {
- this.dlgNamespaceRemove = Ext.create(
'BS.NamespaceManager.NamespaceRemoveDialog',
{id:"bs-namespacemanager-remove-dlg"} );
+ this.dlgNamespaceRemove = Ext.create(
+ 'BS.NamespaceManager.NamespaceRemoveDialog',
+ {
+ id:"bs-namespacemanager-remove-dlg",
+ nsName: selectedRow[0].get( 'name' )
+ }
+ );
this.dlgNamespaceRemove.on( 'ok',
this.onDlgNamespaceRemoveOk, this );
}
- this.dlgNamespaceRemove.setTitle( mw.message(
'bs-namespacemanager-tipRemove' ).plain() );
+ this.dlgNamespaceRemove.setTitle( mw.message(
'bs-namespacemanager-tipremove' ).plain() );
this.dlgNamespaceRemove.setData( selectedRow[0].getData() );
this.dlgNamespaceRemove.show();
this.callParent( arguments );
--
To view, visit https://gerrit.wikimedia.org/r/146428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3d4fa898721eac7b9d8752019884fdf30748aa7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
