Merge pull request #546 from dasgarner/release18

Release 1.8.13
xibosignage · Apr 23, 2019 · 0a02e70 · 0a02e70
2 parents b0a07dd + c14c71a
commit 0a02e70
Show file tree

Hide file tree

Showing 48 changed files with 9,471 additions and 5,015 deletions.
diff --git a/README.md b/README.md
@@ -97,6 +97,19 @@ docker exec -it xibo-cms-tempel_web_1 /var/www/cms/bin/locale.php
 find ./locale ./cache ./lib ./web  -iname "*.php" -print0 | xargs -0 xgettext --from-code=UTF-8 -k_e -k_x -k__ -o locale/default.pot
 ```
 
+To import translations:
+
+```bash
+bzr pull lp:~dangarner/xibo/tempel-translations
+```
+
+Convert to `mo` format:
+
+```bash
+for i in *.po; do msgfmt "$i" -o $(echo $i | sed s/po/mo/); done
+```
+
+Move the resulting `mo` files into your `locale` folder.
 
 # Application Structure
 

diff --git a/lib/Xmds/Soap4.php b/lib/Xmds/Soap4.php
@@ -21,6 +21,7 @@
 namespace Xibo\Xmds;
 
 use Intervention\Image\ImageManagerStatic as Img;
+use Jenssegers\Date\Date;
 use Xibo\Entity\Bandwidth;
 use Xibo\Entity\Display;
 use Xibo\Exception\NotFoundException;
@@ -110,6 +111,23 @@ public function RegisterDisplay($serverKey, $hardwareKey, $displayName, $clientT
                 // Create the XML nodes
                 foreach ($settings as $arrayItem) {
 
+                    // Patch download and update windows to make sure they are unix time stamps
+                    // XMDS schema 4 sent down unix time
+                    // https://github.com/xibosignage/xibo/issues/1791
+                    if (strtolower($arrayItem['name']) == 'downloadstartwindow'
+                        || strtolower($arrayItem['name']) == 'downloadendwindow'
+                        || strtolower($arrayItem['name']) == 'updatestartwindow'
+                        || strtolower($arrayItem['name']) == 'updateendwindow'
+                    ) {
+                        // Split by :
+                        $timeParts = explode(':', $arrayItem['value']);
+                        if ($timeParts[0] == '00' && $timeParts[1] == '00') {
+                            $arrayItem['value'] = 0;
+                        } else {
+                            $arrayItem['value'] = Date::now()->setTime(intval($timeParts[0]), intval($timeParts[1]));
+                        }
+                    }
+
                     $node = $return->createElement($arrayItem['name'], (isset($arrayItem['value']) ? $arrayItem['value'] : $arrayItem['default']));
                     $node->setAttribute('type', $arrayItem['type']);
                     $displayElement->appendChild($node);

diff --git a/lib/Xmds/Soap5.php b/lib/Xmds/Soap5.php
@@ -110,6 +110,18 @@ public function RegisterDisplay($serverKey, $hardwareKey, $displayName, $clientT
                         $arrayItem['value'] = $this->getConfig()->GetSetting('XMR_PUB_ADDRESS');
                     }
 
+                    // Patch download and update windows to make sure they are only 00:00
+                    // https://github.com/xibosignage/xibo/issues/1791
+                    if (strtolower($arrayItem['name']) == 'downloadstartwindow'
+                        || strtolower($arrayItem['name']) == 'downloadendwindow'
+                        || strtolower($arrayItem['name']) == 'updatestartwindow'
+                        || strtolower($arrayItem['name']) == 'updateendwindow'
+                    ) {
+                        // Split by :
+                        $timeParts = explode(':', $arrayItem['value']);
+                        $arrayItem['value'] = $timeParts[0] . ':' . $timeParts[1];
+                    }
+
                     $node = $return->createElement($arrayItem['name'], (isset($arrayItem['value']) ? $arrayItem['value'] : $arrayItem['default']));
                     $node->setAttribute('type', $arrayItem['type']);
                     $displayElement->appendChild($node);

diff --git a/locale/README.md b/locale/README.md
@@ -13,4 +13,10 @@ Translations can be done using the Launchpad Web User Interface.
  3. Download and Install [PoEdit](http://poedit.net/)
  4. Open the PO file you downloaded in POEdit
  5. Make the translations
- 6. Upload the file to Launchpad (making sure you are on the same language translation page)
+ 6. Upload the file to Launchpad (making sure you are on the same language translation page)
+
+Alternatively get the PO files from the translation export branch: 
+
+```bash
+bzr pull lp:~dangarner/xibo/tempel-translations
+```
diff --git a/locale/af.mo b/locale/af.mo
diff --git a/locale/ar.mo b/locale/ar.mo
diff --git a/locale/bg.mo b/locale/bg.mo
diff --git a/locale/ca.mo b/locale/ca.mo
diff --git a/locale/cs.mo b/locale/cs.mo
diff --git a/locale/da.mo b/locale/da.mo
diff --git a/locale/de.mo b/locale/de.mo
diff --git a/locale/default.pot b/locale/default.pot
diff --git a/locale/el.mo b/locale/el.mo
diff --git a/locale/en_GB.mo b/locale/en_GB.mo
diff --git a/locale/es.mo b/locale/es.mo
diff --git a/locale/et.mo b/locale/et.mo
diff --git a/locale/eu.mo b/locale/eu.mo
diff --git a/locale/fa.mo b/locale/fa.mo
diff --git a/locale/fi.mo b/locale/fi.mo
diff --git a/locale/fr.mo b/locale/fr.mo
diff --git a/locale/he.mo b/locale/he.mo
diff --git a/locale/hi.mo b/locale/hi.mo
diff --git a/locale/hr.mo b/locale/hr.mo
diff --git a/locale/hu.mo b/locale/hu.mo
diff --git a/locale/id.mo b/locale/id.mo
diff --git a/locale/it.mo b/locale/it.mo
diff --git a/locale/ja.mo b/locale/ja.mo
diff --git a/locale/ko.mo b/locale/ko.mo
diff --git a/locale/ku.mo b/locale/ku.mo
diff --git a/locale/lb.mo b/locale/lb.mo
diff --git a/locale/lo.mo b/locale/lo.mo
diff --git a/locale/lt.mo b/locale/lt.mo
diff --git a/locale/nb.mo b/locale/nb.mo
diff --git a/locale/nl.mo b/locale/nl.mo
diff --git a/locale/nl_NL.mo b/locale/nl_NL.mo
diff --git a/locale/pl.mo b/locale/pl.mo
diff --git a/locale/pt.mo b/locale/pt.mo
diff --git a/locale/pt_BR.mo b/locale/pt_BR.mo
diff --git a/locale/ro.mo b/locale/ro.mo
diff --git a/locale/ru.mo b/locale/ru.mo
diff --git a/locale/sk.mo b/locale/sk.mo
diff --git a/locale/sl.mo b/locale/sl.mo
diff --git a/locale/sv.mo b/locale/sv.mo
diff --git a/locale/th.mo b/locale/th.mo
diff --git a/locale/tr.mo b/locale/tr.mo
diff --git a/locale/vi.mo b/locale/vi.mo
diff --git a/locale/zh_CN.mo b/locale/zh_CN.mo
diff --git a/locale/zh_TW.mo b/locale/zh_TW.mo