jenkins-bot has submitted this change and it was merged.
Change subject: Merged - Added Messages to number filter range menu
......................................................................
Merged - Added Messages to number filter range menu
* Added i18n messages
* Added Fieldlabels to Ext.ux.grid.menu.RangeMenu
* Added i18n keys to resource module messages array
* => Needs merge to REL1_23
* Ibf0571e3ad35b6086fa89d64b5cb61ed4fd72a06
Change-Id: I64acb5fda1734f9ac2904782c9ea3d5d1e108805
---
M i18n/extjs/de.json
M i18n/extjs/en.json
M i18n/extjs/qqq.json
M resources/Resources.php
M resources/bluespice.extjs/Ext.ux/grid/menu/RangeMenu.js
5 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/i18n/extjs/de.json b/i18n/extjs/de.json
index b422257..f2e3570 100644
--- a/i18n/extjs/de.json
+++ b/i18n/extjs/de.json
@@ -39,6 +39,8 @@
"bs-extjs-filter-contains-not": "enthält nicht",
"bs-extjs-filter-starts-with": "beginnt mit",
"bs-extjs-filter-ends-with": "endet mit",
+ "bs-extjs-filter-greater-than": "größer als",
+ "bs-extjs-filter-less-than": "kleiner als",
"bs-extjs-title-success": "Erfolg",
"bs-extjs-title-warning": "Warnung"
}
diff --git a/i18n/extjs/en.json b/i18n/extjs/en.json
index 23d778b..feae8f8 100644
--- a/i18n/extjs/en.json
+++ b/i18n/extjs/en.json
@@ -39,6 +39,8 @@
"bs-extjs-filter-contains-not": "contains not",
"bs-extjs-filter-starts-with": "starts with",
"bs-extjs-filter-ends-with": "ends with",
+ "bs-extjs-filter-greater-than": "greater than",
+ "bs-extjs-filter-less-than": "less than",
"bs-extjs-title-success": "Success",
"bs-extjs-title-warning": "Warning"
}
diff --git a/i18n/extjs/qqq.json b/i18n/extjs/qqq.json
index 17603c9..36e7470 100644
--- a/i18n/extjs/qqq.json
+++ b/i18n/extjs/qqq.json
@@ -42,6 +42,8 @@
"bs-extjs-filter-contains-not": "Label for contains
not\n{{Identical|contains not}}",
"bs-extjs-filter-starts-with": "Label for starts
with\n{{Identical|starts with}}",
"bs-extjs-filter-ends-with": "Label for ends with\n{{Identical|ends
with}}",
+ "bs-extjs-filter-greater-than": "Label for a filter input box that
fitlers for datasets where the value of the field is greater than the entered
value",
+ "bs-extjs-filter-less-than": "Label for a filter input box that fitlers
for datasets where the value of the field is less than the entered value",
"bs-extjs-title-success": "Window title for
success\n{{Identical|Success}}",
"bs-extjs-title-warning": "Window title for
warning\n{{Identical|Warning}}"
}
diff --git a/resources/Resources.php b/resources/Resources.php
index ebc791c..74be6b7 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -104,8 +104,10 @@
'bs-extjs-filter-contains-not',
'bs-extjs-filter-starts-with',
'bs-extjs-filter-ends-with',
+ 'bs-extjs-filter-greater-than',
+ 'bs-extjs-filter-less-than',
'bs-extjs-title-success',
- 'bs-extjs-title-warning'
+ 'bs-extjs-title-warning',
),
'position' => 'bottom'
) + $aResourceModuleTemplate;
diff --git a/resources/bluespice.extjs/Ext.ux/grid/menu/RangeMenu.js
b/resources/bluespice.extjs/Ext.ux/grid/menu/RangeMenu.js
index 1ae1b6b..c6a1015 100644
--- a/resources/bluespice.extjs/Ext.ux/grid/menu/RangeMenu.js
+++ b/resources/bluespice.extjs/Ext.ux/grid/menu/RangeMenu.js
@@ -73,9 +73,9 @@
}</pre>
*/
fieldLabels: {
- gt: 'Greater Than',
- lt: 'Less Than',
- eq: 'Equal To'
+ gt: mw.messages.get('bs-extjs-filter-greater-than'),
+ lt: mw.messages.get('bs-extjs-filter-less-than'),
+ eq: mw.messages.get('bs-extjs-filter-equals')
},
/**
@@ -90,7 +90,6 @@
* </pre>
*/
menuItemCfgs : {
- emptyText: 'Enter Number...',
selectOnFocus: false,
width: 155
},
@@ -137,6 +136,7 @@
labelCls: 'ux-rangemenu-icon ' + me.itemIconCls[item],
labelSeparator: '',
labelWidth: 29,
+ emptyText: me.fieldLabels[item],
listeners: {
scope: me,
change: me.onInputChange,
--
To view, visit https://gerrit.wikimedia.org/r/192535
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64acb5fda1734f9ac2904782c9ea3d5d1e108805
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pigpen <reym...@hallowelt.biz>
Gerrit-Reviewer: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Tweichart <weich...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
