Robert Vogel has submitted this change and it was merged.

Change subject: Merged - Added Messages to number filter date menu
......................................................................


Merged - Added Messages to number filter date menu

* Added i18n messages
* Added Fieldlabels Ext.ux.grid.filter.DateFilter
* Added i18n keys to resource module messages array
* => Needs manual merge to master

Change-Id: I83a1532911c6a292e871c837a62c36d5df7948c2
---
M languages/BlueSpice.ExtJS.i18n.php
M resources/Resources.php
M resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
3 files changed, 15 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/languages/BlueSpice.ExtJS.i18n.php 
b/languages/BlueSpice.ExtJS.i18n.php
index c8d2782..3129b0e 100644
--- a/languages/BlueSpice.ExtJS.i18n.php
+++ b/languages/BlueSpice.ExtJS.i18n.php
@@ -41,6 +41,9 @@
        'bs-extjs-filter-ends-with' => 'Ends with',
        'bs-extjs-filter-greater-than' => 'Greater than',
        'bs-extjs-filter-less-than' => 'Less than',
+       'bs-extjs-filter-on' => 'On',
+       'bs-extjs-filter-after' => 'After',
+       'bs-extjs-filter-before' => 'Before',
 );
 
 $messages['qqq'] = array(
@@ -81,6 +84,9 @@
        'bs-extjs-filter-ends-with' => 'Label for a filter input box that 
fitlers for datasets where the value of the field ends with the entered value',
        '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-filter-on' => 'Label for a filter input box that fitlers for 
datasets where the value of the field on a specific date',
+       'bs-extjs-filter-after' => 'Label for a filter input box that fitlers 
for datasets where the value of the field after a specific date',
+       'bs-extjs-filter-before' => 'Label for a filter input box that fitlers 
for datasets where the value of the field before a specific date',
 );
 
 $messages['de'] = array(
@@ -122,6 +128,9 @@
        'bs-extjs-filter-ends-with' => 'Endet mit',
        'bs-extjs-filter-greater-than' => 'Größer als',
        'bs-extjs-filter-less-than' => 'Kleiner als',
+       'bs-extjs-filter-on' => 'Am',
+       'bs-extjs-filter-after' => 'Nach dem',
+       'bs-extjs-filter-before' => 'Vor dem',
 );
 
 $messages['de-formal'] = array(
diff --git a/resources/Resources.php b/resources/Resources.php
index 65d63d5..b54013b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -109,6 +109,9 @@
                'bs-extjs-filter-ends-with',
                'bs-extjs-filter-greater-than',
                'bs-extjs-filter-less-than',
+               'bs-extjs-filter-on',
+               'bs-extjs-filter-after',
+               'bs-extjs-filter-before',
        ),
        'position' => 'bottom'
 ) + $aResourceModuleTemplate;
diff --git a/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js 
b/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
index f3d5b2d..7fb2ecd 100644
--- a/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
+++ b/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
@@ -32,12 +32,12 @@
      * @cfg {String} afterText
      * Defaults to 'After'.
      */
-    afterText : 'After',
+    afterText : mw.messages.get('bs-extjs-filter-after'),
     /**
      * @cfg {String} beforeText
      * Defaults to 'Before'.
      */
-    beforeText : 'Before',
+    beforeText : mw.messages.get('bs-extjs-filter-before'),
     /**
      * @cfg {Object} compareMap
      * Map for assigning the comparison values used in serialization.
@@ -86,7 +86,7 @@
      * @cfg {String} onText
      * Defaults to 'On'.
      */
-    onText : 'On',
+    onText : mw.messages.get('bs-extjs-filter-on'),
 
     /**
      * @cfg {Object} pickerOpts

-- 
To view, visit https://gerrit.wikimedia.org/r/192796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I83a1532911c6a292e871c837a62c36d5df7948c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to