Merge pull request #581 from re4jh/master

++ introducing COLON and ELLIPSIS to user them as suffix-tags later on
OXID-eSales · May 19, 2017 · 5174de3 · 5174de3
2 parents 3aa8ee2 + 9591fad
commit 5174de3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/source/Application/views/admin/de/lang.php b/source/Application/views/admin/de/lang.php
@@ -32,6 +32,8 @@
     'fullDateFormat'   => 'd.m.Y H:i:s',
     'simpleDateFormat' => 'd.m.Y',
 
+    'COLON'                             => ':',
+    'ELLIPSIS'                          => '...',
     'GENERAL_ACTIVE'                    => 'Aktiv',
     'GENERAL_ALWAYS_ACTIVE'             => 'Immer aktiv',
     'GENERAL_ACTIVFROMTILL'             => 'Aktiv für Zeitraum',

diff --git a/source/Application/views/admin/en/lang.php b/source/Application/views/admin/en/lang.php
@@ -36,6 +36,8 @@
     'fullDateFormat'   => 'Y-m-d H:i:s',
     'simpleDateFormat' => 'Y-m-d',
 
+    'COLON'                             => ':',
+    'ELLIPSIS'                          => '...',
     'GENERAL_ACTIVE'                    => 'Active',
     'GENERAL_ALWAYS_ACTIVE'             => 'Always active',
     'GENERAL_ACTIVFROMTILL'             => 'Active for a period',