diff --git a/livesupport/modules/htmlUI/var/formmask/generic.inc.php b/livesupport/modules/htmlUI/var/formmask/generic.inc.php index 869949ac5..c34905019 100755 --- a/livesupport/modules/htmlUI/var/formmask/generic.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/generic.inc.php @@ -462,14 +462,18 @@ $ui_fmask = array( 'type' => 'select', 'label' => 'Language', 'options' => array( - 'en_GB' => 'English (GB)', - 'nl_NL' => 'Nederlands (NL)', + 'ar_JO' => 'Arabic(JO)', + 'am_AM' => 'Armenian(AM)', + 'en_UK' => 'English (UK)', + 'en_US' => 'English (US)', + 'es_CO' => 'Español (CO)', 'cz_CZ' => 'Česky (CZ)', 'de_DE' => 'Deutsch (DE)', 'hu_HU' => 'Magyar (HU)', + 'nl_NL' => 'Nederlands (NL)', 'sr_CS' => 'Srpski (CS)', - 'es_CO' => "Español (CO)" - ) + 'ru_RU' => 'Russia(RU)' + ) ) ), diff --git a/livesupport/modules/htmlUI/var/localizer/langCodex.xml b/livesupport/modules/htmlUI/var/localizer/langCodex.xml deleted file mode 100755 index ba56bd236..000000000 --- a/livesupport/modules/htmlUI/var/localizer/langCodex.xml +++ /dev/null @@ -1,571 +0,0 @@ - - - - aa - Afar - - - ab - Abkhazian - - - af - Afrikaans - - - am - Amharic - - - ar - Arabic - - - as - Assamese - - - ay - Aymara - - - az - Azerbaijani - - - ba - Bashkir - - - be - Byelorussian - - - bg - Bulgarian - - - bh - Bihari - - - bi - Bislama - - - bn - Bengali; Bangla - - - bo - Tibetan - - - br - Breton - - - ca - Catalan - - - co - Corsican - - - cs - Czech - - - cy - Welsh - - - da - Danish - - - de - German - - - dz - Bhutani - - - el - Greek - - - en - English - - - eo - Esperanto - - - es - Spanish - - - et - Estonian - - - eu - Basque - - - fa - Persian - - - fi - Finnish - - - fj - Fiji - - - fo - Faeroese - - - fr - French - - - fy - Frisian - - - ga - Irish - - - gd - Scots, Gaelic - - - gl - Galician - - - gn - Guarani - - - gu - Gujarati - - - he - Hebrew - - - ha - Hausa - - - hi - Hindi - - - hr - Croatian - - - hu - Hungarian - - - hy - Armenian - - - ia - Interlingua - - - id - Indonesian - - - ie - Interlingue - - - ik - Inupiak - - - in - Indonesian - - - is - Icelandic - - - it - Italian - - - iu - Inuktitut - - - iw - Hebrew (obsolete) - - - ja - Japanese - - - ji - Yiddish (obsolete) - - - jw - Javanese - - - ka - Georgian - - - kk - Kazakh - - - kl - Greenlandic - - - km - Cambodian - - - kn - Kannada - - - ko - Korean - - - ks - Kashmiri - - - ku - Kurdish - - - ky - Kirghiz - - - la - Latin - - - ln - Lingala - - - lo - Laothian - - - lt - Lithuanian - - - lv - Latvian, Lettish - - - mg - Malagasy - - - mi - Maori - - - mk - Macedonian - - - ml - Malayalam - - - mn - Mongolian - - - mo - Moldavian - - - mr - Marathi - - - ms - Malay - - - mt - Maltese - - - my - Burmese - - - na - Nauru - - - ne - Nepali - - - nl - Dutch - - - no - Norwegian - - - oc - Occitan - - - om - (Afan), Oromo - - - or - Oriya - - - pa - Punjabi - - - pl - Polish - - - ps - Pashto, Pushto - - - pt - Portuguese - - - qu - Quechua - - - rm - Rhaeto-Romance - - - rn - Kirundi - - - ro - Romanian - - - ru - Russian - - - rw - Kinyarwanda - - - sa - Sanskrit - - - sd - Sindhi - - - sg - Sangro - - - sh - Serbo-Croatian - - - si - Singhalese - - - sk - Slovak - - - sl - Slovenian - - - sm - Samoan - - - sn - Shona - - - so - Somali - - - sq - Albanian - - - sr - Serbian - - - ss - Siswati - - - st - Sesotho - - - su - Sundanese - - - sv - Swedish - - - sw - Swahili - - - ta - Tamil - - - te - Tegulu - - - tg - Tajik - - - th - Thai - - - ti - Tigrinya - - - tk - Turkmen - - - tl - Tagalog - - - tn - Setswana - - - to - Tonga - - - tr - Turkish - - - ts - Tsonga - - - tt - Tatar - - - tw - Twi - - - ug - Uigur - - - uk - Ukrainian - - - ur - Urdu - - - uz - Uzbek - - - vi - Vietnamese - - - vo - Volapuk - - - wo - Wolof - - - xh - Xhosa - - - y - Yiddish - - - yo - Yoruba - - - za - Zuang - - - zh - Chinese - - - zu - Zulu - - diff --git a/livesupport/modules/htmlUI/var/localizer/languages.txt b/livesupport/modules/htmlUI/var/localizer/languages.txt deleted file mode 100755 index 5a7d47184..000000000 --- a/livesupport/modules/htmlUI/var/localizer/languages.txt +++ /dev/null @@ -1,142 +0,0 @@ -aa Afar -ab Abkhazian -af Afrikaans -am Amharic -ar Arabic -as Assamese -ay Aymara -az Azerbaijani -ba Bashkir -be Byelorussian -bg Bulgarian -bh Bihari -bi Bislama -bn Bengali; Bangla -bo Tibetan -br Breton -ca Catalan -co Corsican -cs Czech -cy Welsh -da Danish -de German -dz Bhutani -el Greek -en English -eo Esperanto -es Spanish -et Estonian -eu Basque -fa Persian -fi Finnish -fj Fiji -fo Faeroese -fr French -fy Frisian -ga Irish -gd Scots, Gaelic -gl Galician -gn Guarani -gu Gujarati -he Hebrew -ha Hausa -hi Hindi -hr Croatian -hu Hungarian -hy Armenian -ia Interlingua -id Indonesian -ie Interlingue -ik Inupiak -in Indonesian -is Icelandic -it Italian -iu Inuktitut -iw Hebrew (obsolete) -ja Japanese -ji Yiddish (obsolete) -jw Javanese -ka Georgian -kk Kazakh -kl Greenlandic -km Cambodian -kn Kannada -ko Korean -ks Kashmiri -ku Kurdish -ky Kirghiz -la Latin -ln Lingala -lo Laothian -lt Lithuanian -lv Latvian, Lettish -mg Malagasy -mi Maori -mk Macedonian -ml Malayalam -mn Mongolian -mo Moldavian -mr Marathi -ms Malay -mt Maltese -my Burmese -na Nauru -ne Nepali -nl Dutch -no Norwegian -oc Occitan -om (Afan), Oromo -or Oriya -pa Punjabi -pl Polish -ps Pashto, Pushto -pt Portuguese -qu Quechua -rm Rhaeto-Romance -rn Kirundi -ro Romanian -ru Russian -rw Kinyarwanda -sa Sanskrit -sd Sindhi -sg Sangro -sh Serbo-Croatian -si Singhalese -sk Slovak -sl Slovenian -sm Samoan -sn Shona -so Somali -sq Albanian -sr Serbian -ss Siswati -st Sesotho -su Sundanese -sv Swedish -sw Swahili -ta Tamil -te Tegulu -tg Tajik -th Thai -ti Tigrinya -tk Turkmen -tl Tagalog -tn Setswana -to Tonga -tr Turkish -ts Tsonga -tt Tatar -tw Twi -ug Uigur -uk Ukrainian -ur Urdu -uz Uzbek -vi Vietnamese -vo Volapuk -wo Wolof -xh Xhosa -y Yiddish -yo Yoruba -za Zuang -zh Chinese -zu Zulu \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/localizer/languages.xml b/livesupport/modules/htmlUI/var/localizer/languages.xml index 15d884728..3afe71885 100755 --- a/livesupport/modules/htmlUI/var/localizer/languages.xml +++ b/livesupport/modules/htmlUI/var/localizer/languages.xml @@ -1,38 +1,70 @@ + - en_GB - English(GB) + ar_JO + Arabic(JO) + Arabic + + + + am_AM + Armenian(AM) + Armenian + + + + en_UK + English(UK) English + + + en_US + English(US) + English + + cz_CZ Czech(CZ) Czech + nl_NL Dutch(NL) Dutch + de_DE Deutsch(DE) Deutsch + hu_HU Hungarian(HU) Hungarian + sr_CS Serbian(CS) Serbian + es_CO Spanish(CO) Spanish + + + ru_RU + Russia(RU) + Russia + + diff --git a/livesupport/modules/htmlUI/var/localizer/locals.am_AM.xml b/livesupport/modules/htmlUI/var/localizer/locals.am_AM.xml new file mode 100644 index 000000000..c11d016b1 --- /dev/null +++ b/livesupport/modules/htmlUI/var/localizer/locals.am_AM.xml @@ -0,0 +1,122 @@ + + + am_AM + checked + + collect expressions + + + localizer + + + $1 file already exist in $2 + + + edit "$1" + + + edit '$1' + + + create new language file $1 + + + create new language file in + + + delete + + + edit + + + entrys: + + + $1 and $2 files already exist in $3 + + + ok + + + add new fields: + + + name + + + native name + + + code + + + source: + + + target: + + + manage languages + + + choose language + + + key: + + + cannot open $1 + + + key "$1" already exists in $2-file + + + show only untranslated + + + cannot read $1 + + + translate from: + + + really delete this entry? + + + fully translated + + + after + + + go + + + back + + + and select file type + + + and enter a positive integer value + + + save to file + + + add new language + + + create language files + + + at begin + + + at end + + + key + + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/localizer/locals.ar_JO.xml b/livesupport/modules/htmlUI/var/localizer/locals.ar_JO.xml new file mode 100644 index 000000000..996e211cc --- /dev/null +++ b/livesupport/modules/htmlUI/var/localizer/locals.ar_JO.xml @@ -0,0 +1,122 @@ + + + ar_JO + checked + + collect expressions + + + localizer + + + $1 file already exist in $2 + + + edit "$1" + + + edit '$1' + + + create new language file $1 + + + create new language file in + + + delete + + + edit + + + entrys: + + + $1 and $2 files already exist in $3 + + + ok + + + add new fields: + + + name + + + native name + + + code + + + source: + + + target: + + + manage languages + + + choose language + + + key: + + + cannot open $1 + + + key "$1" already exists in $2-file + + + show only untranslated + + + cannot read $1 + + + translate from: + + + really delete this entry? + + + fully translated + + + after + + + go + + + back + + + and select file type + + + and enter a positive integer value + + + save to file + + + add new language + + + create language files + + + at begin + + + at end + + + key + + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/localizer/locals.en_GB.xml b/livesupport/modules/htmlUI/var/localizer/locals.en_UK.xml similarity index 99% rename from livesupport/modules/htmlUI/var/localizer/locals.en_GB.xml rename to livesupport/modules/htmlUI/var/localizer/locals.en_UK.xml index 69d98202c..b3c9da890 100755 --- a/livesupport/modules/htmlUI/var/localizer/locals.en_GB.xml +++ b/livesupport/modules/htmlUI/var/localizer/locals.en_UK.xml @@ -1,6 +1,6 @@ - en_GB + en_UK checked collect expressions diff --git a/livesupport/modules/htmlUI/var/localizer/locals.en_US.xml b/livesupport/modules/htmlUI/var/localizer/locals.en_US.xml new file mode 100644 index 000000000..206d9746a --- /dev/null +++ b/livesupport/modules/htmlUI/var/localizer/locals.en_US.xml @@ -0,0 +1,122 @@ + + + en_US + checked + + collect expressions + + + localizer + + + $1 file already exist in $2 + + + edit "$1" + + + edit '$1' + + + create new language file $1 + + + create new language file in + + + delete + + + edit + + + entrys: + + + $1 and $2 files already exist in $3 + + + ok + + + add new fields: + + + name + + + native name + + + code + + + source: + + + target: + + + manage languages + + + choose language + + + key: + + + cannot open $1 + + + key "$1" already exists in $2-file + + + show only untranslated + + + cannot read $1 + + + translate from: + + + really delete this entry? + + + fully translated + + + after + + + go + + + back + + + and select file type + + + and enter a positive integer value + + + save to file + + + add new language + + + create language files + + + at begin + + + at end + + + key + + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/localizer/locals.ru_RU.xml b/livesupport/modules/htmlUI/var/localizer/locals.ru_RU.xml new file mode 100644 index 000000000..ea4673823 --- /dev/null +++ b/livesupport/modules/htmlUI/var/localizer/locals.ru_RU.xml @@ -0,0 +1,122 @@ + + + ru_RU + checked + + collect expressions + + + localizer + + + $1 file already exist in $2 + + + edit "$1" + + + edit '$1' + + + create new language file $1 + + + create new language file in + + + delete + + + edit + + + entrys: + + + $1 and $2 files already exist in $3 + + + ok + + + add new fields: + + + name + + + native name + + + code + + + source: + + + target: + + + manage languages + + + choose language + + + key: + + + cannot open $1 + + + key "$1" already exists in $2-file + + + show only untranslated + + + cannot read $1 + + + translate from: + + + really delete this entry? + + + fully translated + + + after + + + go + + + back + + + and select file type + + + and enter a positive integer value + + + save to file + + + add new language + + + create language files + + + at begin + + + at end + + + key + + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/localizer/require.inc.php b/livesupport/modules/htmlUI/var/localizer/require.inc.php index d071082f3..a8295d138 100755 --- a/livesupport/modules/htmlUI/var/localizer/require.inc.php +++ b/livesupport/modules/htmlUI/var/localizer/require.inc.php @@ -10,7 +10,7 @@ require_once('display.inc.php'); require_once('data.inc.php'); require_once('helpfunctions.inc.php'); -define('_DEFAULT_LANG_', 'en_GB'); +define('_DEFAULT_LANG_', 'en_UK'); define('_PREFIX_', 'locals'); define('_PREFIX_GLOBAL_','globals'); define('_PREFIX_HIDE_', '.'); diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl index d6b0209c3..c9903b7eb 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/calendar.tpl @@ -25,7 +25,7 @@
    @@ -45,7 +45,7 @@ ##CW## {foreach from=$SCHEDULER->Week item="_Weekday"} - {$_Weekday.label.short|truncate:2:""} + {tra str=$_Weekday.label.short|truncate:2:""} {/foreach} diff --git a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl index b3eb29613..69f1c1435 100644 --- a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl @@ -17,7 +17,7 @@ function pre0_myClock(y, m, d, h, i ,s, interval) { function pre0_incClock() { pre0_clock['time'].setTime(pre0_clock['time'].getTime() + pre0_clock['interval']); - document.getElementById("servertime").innerHTML = twoDigit(pre0_clock['time'].getHours()) + ":" + twoDigit(pre0_clock['time'].getMinutes()) + ":" + twoDigit(pre0_clock['time'].getSeconds()); + document.getElementById("statusbar_servertime").innerHTML = twoDigit(pre0_clock['time'].getHours()) + ":" + twoDigit(pre0_clock['time'].getMinutes()) + ":" + twoDigit(pre0_clock['time'].getSeconds()); } @@ -30,7 +30,7 @@ function elapsed_myClock(y, m, d, h, i, s, interval) { function elapsed_incClock() { elapsed_clock['time'].setTime(elapsed_clock['time'].getTime() + elapsed_clock['interval']); - document.getElementById("nowplaying_elapsed").innerHTML = twoDigit(elapsed_clock['time'].getHours()) + ":" + twoDigit(elapsed_clock['time'].getMinutes()) + ":" + twoDigit(elapsed_clock['time'].getSeconds()); + document.getElementById("statusbar_elapsed").innerHTML = twoDigit(elapsed_clock['time'].getHours()) + ":" + twoDigit(elapsed_clock['time'].getMinutes()) + ":" + twoDigit(elapsed_clock['time'].getSeconds()); } @@ -43,13 +43,13 @@ function remaining_myClock(y, m, d, h, i, s, interval) { function remaining_incClock() { remaining_clock['time'].setTime(remaining_clock['time'].getTime() - remaining_clock['interval']); - document.getElementById("nowplaying_remaining").innerHTML = twoDigit(remaining_clock['time'].getHours()) + ":" + twoDigit(remaining_clock['time'].getMinutes()) + ":" + twoDigit(remaining_clock['time'].getSeconds()); + document.getElementById("statusbar_remaining").innerHTML = twoDigit(remaining_clock['time'].getHours()) + ":" + twoDigit(remaining_clock['time'].getMinutes()) + ":" + twoDigit(remaining_clock['time'].getSeconds()); if (remaining_clock['time'].getHours() == 0 && remaining_clock['time'].getMinutes() == 0 && remaining_clock['time'].getSeconds() == 0) { clearInterval(elapsed_clock['run']); clearInterval(remaining_clock['run']); - document.getElementById("onair").innerHTML = 'off air'; - document.getElementById("whatplaying").innerHTML = ''; + document.getElementById("statusbar_indicator").innerHTML = 'off air'; + document.getElementById("statusbar_whatsplaying").innerHTML = ''; } } diff --git a/livesupport/modules/htmlUI/var/templates/statusbar.tpl b/livesupport/modules/htmlUI/var/templates/statusbar.tpl index ccd547546..f229dfef2 100755 --- a/livesupport/modules/htmlUI/var/templates/statusbar.tpl +++ b/livesupport/modules/htmlUI/var/templates/statusbar.tpl @@ -20,7 +20,7 @@ -
+
{if $_nowplaying} on air {else} @@ -31,28 +31,21 @@

##Station Time##

-
{$smarty.now|date_format:"%H:%M:%S"} +
{$smarty.now|date_format:"%H:%M:%S"}
cet
- {* -

##Local Time##

-
- -
cet
-
- *}
-
+
{if $_nowplaying}
Now Playing: {$_nowplaying.title}
-
 
+
 
-
Elapsed: {$_nowplaying.elapsed.h}:{$_nowplaying.elapsed.m}:{$_nowplaying.elapsed.s|truncate:2:""}
-
Remaining: {$_nowplaying.remaining.h}:{$_nowplaying.remaining.m}:{$_nowplaying.remaining.s|truncate:2:""}
+
Elapsed: {$_nowplaying.elapsed.h}:{$_nowplaying.elapsed.m}:{$_nowplaying.elapsed.s|truncate:2:""}
+
Remaining: {$_nowplaying.remaining.h}:{$_nowplaying.remaining.m}:{$_nowplaying.remaining.s|truncate:2:""}
{/if}