← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Middleware/Theme.php

  • Committer: GitHub
  • Author(s): Dan Garner
  • Date: 2018-06-20 16:27:37 UTC
  • mfrom: (652)
  • mto: This revision was merged to the branch mainline in revision 653.
  • Revision ID: git-v1:1a1ca01506202d782ed245fa27b6ce6c32f0a216
Merge branch 'release18' into bugfix/1.8.10-pack2

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Middleware/Theme.php
80
80
                'locale' => Translate::GetLocale(),
81
81
                'jsLocale' => Translate::GetJsLocale(),
82
82
                'jsShortLocale' => ((strlen(Translate::GetJsLocale()) > 2) ? substr(Translate::GetJsLocale(), 0, 2) : Translate::GetJsLocale()),
83
 
                'calendarLanguage' => ((strlen(Translate::GetJsLocale()) <= 2) ? Translate::GetJsLocale() . '-' . strtoupper(Translate::GetJsLocale()) : Translate::GetJsLocale()),
84
 
                'boostrapSelectLanguage' => ((strlen(Translate::GetJsLocale()) <= 2) ? Translate::GetJsLocale() . '_' . strtoupper(Translate::GetJsLocale()) : Translate::GetLocale())
 
83
                'calendarLanguage' => ((strlen(Translate::GetJsLocale()) <= 2) ? Translate::GetJsLocale() . '-' . strtoupper(Translate::GetJsLocale()) : Translate::GetJsLocale())
85
84
            ],
86
85
            'translations' => '{}',
87
86
            'libraryUpload' => [