Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/324903
Change subject: BS.store:LocalNamespaces: Fixed 'all' and 'main'
......................................................................
BS.store:LocalNamespaces: Fixed 'all' and 'main'
The items "(all)" and "(Main)" were not accessible anymore. This patch
fixes the issue.
Change-Id: I3e559ddee2825af9f2654484219144f6bfba59a4
---
M extension.json
M i18n/extjs/de.json
M i18n/extjs/en.json
M i18n/extjs/qqq.json
M resources/bluespice.extjs/BS/store/LocalNamespaces.js
5 files changed, 8 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/03/324903/1
diff --git a/extension.json b/extension.json
index e45d1a6..e87d9fd 100644
--- a/extension.json
+++ b/extension.json
@@ -102,6 +102,7 @@
"bs-extjs-confirmNavigationTitle",
"bs-extjs-confirmNavigationText",
"bs-extjs-allns",
+ "bs-extjs-mainns",
"bs-extjs-upload",
"bs-extjs-browse",
"bs-extjs-uploading",
diff --git a/i18n/extjs/de.json b/i18n/extjs/de.json
index 7a11aee..0249d40 100644
--- a/i18n/extjs/de.json
+++ b/i18n/extjs/de.json
@@ -33,6 +33,7 @@
"bs-extjs-confirmNavigationTitle": "Dem Link folgen",
"bs-extjs-confirmNavigationText": "Möchtest du wirklich diesem Link
folgen? Alle dynamischen Einstellungen, wie Filter und Sortierung, auf dieser
Seite gehen dabei verloren.",
"bs-extjs-allns": "(alle)",
+ "bs-extjs-mainns": "(Seiten)",
"bs-extjs-filters": "Filter",
"bs-extjs-filter-equals": "ist",
"bs-extjs-filter-equals-not": "ist nicht",
diff --git a/i18n/extjs/en.json b/i18n/extjs/en.json
index bb973a3..32e0873 100644
--- a/i18n/extjs/en.json
+++ b/i18n/extjs/en.json
@@ -33,6 +33,7 @@
"bs-extjs-confirmNavigationTitle": "Follow link",
"bs-extjs-confirmNavigationText": "Do you really want to follow this
link? All dynamic settings like filtering or sorting on the current page will
be lost.",
"bs-extjs-allns": "(all)",
+ "bs-extjs-mainns": "(Main)",
"bs-extjs-filters": "Filters",
"bs-extjs-filter-equals": "equals",
"bs-extjs-filter-equals-not": "equals not",
diff --git a/i18n/extjs/qqq.json b/i18n/extjs/qqq.json
index 6e32fca..2dd84b9 100644
--- a/i18n/extjs/qqq.json
+++ b/i18n/extjs/qqq.json
@@ -36,6 +36,7 @@
"bs-extjs-confirmNavigationTitle": "Title for prompt that warns you if
you want to follow a link but have unsaved changes.\n\nFollowed by the
following prompt:\n* {{msg-mw|Bs-extjs-confirmNavigationText}}",
"bs-extjs-confirmNavigationText": "Text for prompt that warns you if
you want to follow a link but have unsaved changes.\n\nPreceded by the title
{{msg-mw|Bs-extjs-confirmNavigationTitle}}.",
"bs-extjs-allns": "Selector for all namespaces in namespace combo
boxes.\n{{Identical|All}}",
+ "bs-extjs-mainns": "Selector for main namespace in namespace combo
boxes.\n{{Identical|Blanknamespace}}",
"bs-extjs-filters": "Label for filters\n{{Identical|Filter}}",
"bs-extjs-filter-equals": "Label for equals\n{{Identical|equals}}",
"bs-extjs-filter-equals-not": "Label for equals not\n{{Identical|equals
not}}",
diff --git a/resources/bluespice.extjs/BS/store/LocalNamespaces.js
b/resources/bluespice.extjs/BS/store/LocalNamespaces.js
index 51d75c2..76c3ae4 100644
--- a/resources/bluespice.extjs/BS/store/LocalNamespaces.js
+++ b/resources/bluespice.extjs/BS/store/LocalNamespaces.js
@@ -9,11 +9,9 @@
excludeIds: [],
constructor: function( config ){
- config = Ext.merge({
- includeAll: false,
- excludeIds: [],
- data: this.getLocalNamespaces()
- }, config );
+ this.includeAll = config.includeAll || this.includeAll;
+ this.excludeIds = config.excludeIds || this.excludeIds;
+ this.data = config.data || this.getLocalNamespaces();
this.callParent( [config] );
},
getLocalNamespaces: function() {
@@ -34,7 +32,7 @@
var namespace = {};
namespace.id = +id;
if ( namespace.id === 0 ) {
- namespace.namespace = mw.message(
'blanknamespace' ).plain();
+ namespace.namespace = mw.message(
'bs-extjs-mainns' ).plain();
} else {
namespace.namespace = mw.config.get(
"wgFormattedNamespaces" )[id];
}
--
To view, visit https://gerrit.wikimedia.org/r/324903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e559ddee2825af9f2654484219144f6bfba59a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
