Author: mherger
Date: Wed Feb 24 06:33:05 2010
New Revision: 8564
URL: http://svn.slimdevices.com/jive?rev=8564&view=rev
Log:
Fixed Bug: 14538
Description: add jive.utils.datetime:getCurrentDate() method to get localized
date string. Please use this instead of os.date() if you want a localized and
formatted date string as defined in the settings.
Don't show the confusing formatting string in the date settings, but only
localized date instead.
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
7.5/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua?rev=8564&r1=8563&r2=8564&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
Wed Feb 24 06:33:05 2010
@@ -18,7 +18,6 @@
-- stuff we use
local ipairs, pairs, io, string, tostring = ipairs, pairs, io, string, tostring
-local os = os
local oo = require("loop.simple")
@@ -146,17 +145,8 @@
local menu = SimpleMenu("menu", {})
for k,v in pairs(datetime:getAllShortDateFormats()) do
- local _text = os.date(v)
- if string.match(v, '%%d') or string.match(v, '%%m') then
- local _help = _getDateHelpString(v)
- _text = _text .. " (" .. _help .. ")"
- end
---[[ if tostring(v) == '%D' then
- _text = _text .. " (mm/dd/yy)"
- end
---]]
menu:addItem({
- text = _text,
+ text = datetime:getCurrentDate(v),
style = 'item_choice',
check = RadioButton("radio", group,
function(event, menuItem)
self:setShortDateFormat(v)
@@ -181,17 +171,8 @@
local menu = SimpleMenu("menu", {})
for k,v in pairs(datetime:getAllDateFormats()) do
- local _text = os.date(v)
- if string.match(v, '%%d') or string.match(v, '%%m') then
- local _help = _getDateHelpString(v)
- _text = _text .. " (" .. _help .. ")"
- end
---[[ if tostring(v) == '%D' then
- _text = _text .. " (mm/dd/yy)"
- end
---]]
menu:addItem({
- text = _text,
+ text = datetime:getCurrentDate(v),
style = 'item_choice',
check = RadioButton("radio", group,
function(event, menuItem)
self:setDateFormat(v)
@@ -206,18 +187,6 @@
return window
end
-function _getDateHelpString(dateString)
- dateString = string.gsub(dateString, '%%d', 'DD')
- dateString = string.gsub(dateString, '%%m', 'MM')
- dateString = string.gsub(dateString, '%%Y', 'YYYY')
- dateString = string.gsub(dateString, '%%y', 'YY')
- dateString = string.gsub(dateString, '%%a', 'WWW')
- dateString = string.gsub(dateString, '%%A', 'WWWW')
- dateString = string.gsub(dateString, '%%b', 'MMM')
- dateString = string.gsub(dateString, '%%B', 'MMMM')
- return dateString
-end
-
function weekstartSetting(self, menuItem)
local window = Window("text_list", menuItem.text, datetimeTitleStyle)
local group = RadioGroup()
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt?rev=8564&r1=8563&r2=8564&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt
(original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/global_strings.txt Wed Feb
24 06:33:05 2010
@@ -392,3 +392,382 @@
RU гоÑово
SV klart
+MONTH_1
+ CS Leden
+ DA Januar
+ DE Januar
+ EN January
+ ES Enero
+ FI Tammikuu
+ FR Janvier
+ IT Gennaio
+ NL januari
+ NO januar
+ PL StyczeÅ
+ RU ЯнваÑÑ
+ SV januari
+
+MONTH_2
+ CS Ãnor
+ DA Februar
+ DE Februar
+ EN February
+ ES Febrero
+ FI Helmikuu
+ FR Février
+ IT Febbraio
+ NL februari
+ NO februar
+ PL Luty
+ RU ФевÑалÑ
+ SV februari
+
+MONTH_3
+ CS BÅezen
+ DA Marts
+ DE März
+ EN March
+ ES Marzo
+ FI Maaliskuu
+ FR Mars
+ IT Marzo
+ NL maart
+ NO mars
+ PL Marzec
+ RU ÐаÑÑ
+ SV mars
+
+MONTH_4
+ CS Duben
+ DA april
+ DE April
+ EN April
+ ES Abril
+ FI Huhtikuu
+ FR Avril
+ IT Aprile
+ NL april
+ NO april
+ PL KwiecieÅ
+ RU ÐпÑелÑ
+ SV april
+
+MONTH_5
+ CS KvÄten
+ DA maj
+ DE Mai
+ EN May
+ ES Mayo
+ FI Toukokuu
+ FR Mai
+ IT Maggio
+ NL mei
+ NO mai
+ PL Maj
+ RU Ðай
+ SV maj
+
+MONTH_6
+ CS Äerven
+ DA Juni
+ DE Juni
+ EN June
+ ES Junio
+ FI Kesäkuu
+ FR Juin
+ IT Giugno
+ NL juni
+ NO juni
+ PL Czerwiec
+ RU ÐÑнÑ
+ SV juni
+
+MONTH_7
+ CS Äervenec
+ DA Juli
+ DE Juli
+ EN July
+ ES Julio
+ FI Heinäkuu
+ FR Juillet
+ IT Luglio
+ NL juli
+ NO juli
+ PL Lipiec
+ RU ÐÑлÑ
+ SV juli
+
+MONTH_8
+ CS ÅÃjen
+ DA august
+ DE August
+ EN August
+ ES Agosto
+ FI Elokuu
+ FR Août
+ IT Agosto
+ NL augustus
+ NO august
+ PL SierpieÅ
+ RU ÐвгÑÑÑ
+ SV augusti
+
+MONTH_9
+ CS ZáÅÃ
+ DA september
+ DE September
+ EN September
+ ES Septiembre
+ FI Syyskuu
+ FR Septembre
+ IT Settembre
+ NL september
+ NO september
+ PL WrzesieÅ
+ RU СенÑÑбÑÑ
+ SV september
+
+MONTH_10
+ CS ÅÃjen
+ DA Oktober
+ DE Oktober
+ EN October
+ ES Octubre
+ FI Lokakuu
+ FR Octobre
+ IT Ottobre
+ NL oktober
+ NO oktober
+ PL Październik
+ RU ÐкÑÑбÑÑ
+ SV oktober
+
+MONTH_11
+ CS Listopad
+ DA november
+ DE November
+ EN November
+ ES Noviembre
+ FI Marraskuu
+ FR Novembre
+ IT Novembre
+ NL november
+ NO november
+ PL Listopad
+ RU ÐоÑбÑÑ
+ SV november
+
+MONTH_12
+ CS Prosinec
+ DA december
+ DE Dezember
+ EN December
+ ES Diciembre
+ FI Joulukuu
+ FR Décembre
+ IT Dicembre
+ NL december
+ NO desember
+ PL GrudzieÅ
+ RU ÐекабÑÑ
+ SV december
+
+MONTHSHORT_1
+# SLT - please use three character short version of the month January
+ DE Jan
+ EN Jan
+
+MONTHSHORT_2
+# SLT - please use three character short version of the month February
+ DE Feb
+ EN Feb
+
+MONTHSHORT_3
+# SLT - please use three character short version of the month March
+ DE Mär
+ EN Mar
+
+MONTHSHORT_4
+# SLT - please use three character short version of the month April
+ DE Apr
+ EN Apr
+
+MONTHSHORT_5
+# SLT - please use three character short version of the month May
+ DE Mai
+ EN May
+
+MONTHSHORT_6
+# SLT - please use three character short version of the month June
+ DE Jun
+ EN Jun
+
+MONTHSHORT_7
+# SLT - please use three character short version of the month July
+ DE Jul
+ EN Jul
+
+MONTHSHORT_8
+# SLT - please use three character short version of the month August
+ DE Aug
+ EN Aug
+
+MONTHSHORT_9
+# SLT - please use three character short version of the month September
+ DE Sep
+ EN Sep
+
+MONTHSHORT_10
+# SLT - please use three character short version of the month October
+ DE Okt
+ EN Oct
+
+MONTHSHORT_11
+# SLT - please use three character short version of the month November
+ DE Nov
+ EN Nov
+
+MONTHSHORT_12
+# SLT - please use three character short version of the month December
+ DE Dez
+ EN Dec
+
+DAY_1
+ CS NedÄle
+ DA Søndag
+ DE Sonntag
+ EN Sunday
+ ES Domingo
+ FI sunnuntai
+ FR Dimanche
+ IT Domenica
+ NL Zondag
+ NO søndag
+ PL Niedziela
+ RU ÐоÑкÑеÑенÑе
+ SV Söndag
+
+DAY_2
+ CS PondÄlÃ
+ DA Mandag
+ DE Montag
+ EN Monday
+ ES Lunes
+ FI maanantai
+ FR Lundi
+ IT Lunedì
+ NL Maandag
+ NO Mandag
+ PL PoniedziaÅek
+ RU ÐонеделÑник
+ SV MÃ¥ndag
+
+DAY_3
+ CS Ãterý
+ DA Tirsdag
+ DE Dienstag
+ EN Tuesday
+ ES Martes
+ FI tiistai
+ FR Mardi
+ IT Martedì
+ NL Dinsdag
+ NO Tirsdag
+ PL Wtorek
+ RU ÐÑоÑник
+ SV Tisdag
+
+DAY_4
+ CS StÅeda
+ DA Onsdag
+ DE Mittwoch
+ EN Wednesday
+ ES Miércoles
+ FI Keskiviikko
+ FR Mercredi
+ IT Mercoledì
+ NL Woensdag
+ NO Onsdag
+ PL Åroda
+ RU СÑеда
+ SV Onsdag
+
+DAY_5
+ CS Ätvrtek
+ DA Torsdag
+ DE Donnerstag
+ EN Thursday
+ ES Jueves
+ FI torstai
+ FR Jeudi
+ IT Giovedì
+ NL Donderdag
+ NO torsdag
+ PL Czwartek
+ RU ЧеÑвеÑг
+ SV Torsdag
+
+DAY_6
+ CS Pátek
+ DA Fredag
+ DE Freitag
+ EN Friday
+ ES Viernes
+ FI perjantai
+ FR Vendredi
+ IT Venerdì
+ NL Vrijdag
+ NO Fredag
+ PL PiÄ
tek
+ RU ÐÑÑниÑа
+ SV Fredag
+
+DAY_7
+ CS Sobota
+ DA Lørdag
+ DE Samstag
+ EN Saturday
+ ES Sábado
+ FI lauantai
+ FR Samedi
+ IT Sabato
+ NL Zaterdag
+ NO Lørdag
+ PL Sobota
+ RU СÑббоÑа
+ SV Lördag
+
+DAYSHORT_1
+# SLT - please use three character short version of Sunday
+ DE Son
+ EN Sun
+
+DAYSHORT_2
+# SLT - please use three character short version of Monday
+ DE Mon
+ EN Mon
+
+DAYSHORT_3
+# SLT - please use three character short version of Tuesday
+ DE Die
+ EN Tue
+
+DAYSHORT_4
+# SLT - please use three character short version of Wednesday
+ DE Mit
+ EN Wed
+
+DAYSHORT_5
+# SLT - please use three character short version of Thursday
+ DE Don
+ EN Thu
+
+DAYSHORT_6
+# SLT - please use three character short version of Friday
+ DE Fre
+ EN Fri
+
+DAYSHORT_7
+# SLT - please use three character short version of Saturday
+ DE Sam
+ EN Sat
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua?rev=8564&r1=8563&r2=8564&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua
(original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/utils/datetime.lua Wed Feb
24 06:33:05 2010
@@ -36,6 +36,7 @@
local os = require("os")
local math = require("math")
+local locale = require("jive.utils.locale")
local log = require("jive.utils.log").logger("squeezeplay")
@@ -48,6 +49,8 @@
local globalShortDateFormat = "%d.%m.%Y"
local globalHours = "12"
local globalTimeZone = "GMT"
+
+local _globalStrings
local timeSet = false
@@ -207,14 +210,32 @@
end
--[[
-=head2 getCurrentTime(self)
+=head2 getCurrentDate(self)
Returns a date string using the set date format.
=cut
--]]
-function getCurrentTime(self)
- return os.date(globalDateFormat)
+function getCurrentDate(self, format)
+ local formattedDate = format or globalDateFormat
+ local date = os.date("*t")
+
+ -- now we're going to try to localise the date string...
+ if _globalStrings == nil then
+ _globalStrings = locale:readGlobalStringsFile()
+ end
+
+ -- long day format
+ formattedDate = string.gsub(formattedDate, "%%A",
tostring(_globalStrings:str("DAY_" .. date.wday)))
+ -- short day format
+ formattedDate = string.gsub(formattedDate, "%%a",
tostring(_globalStrings:str("DAYSHORT_" .. date.wday)))
+ -- long month format
+ formattedDate = string.gsub(formattedDate, "%%B",
tostring(_globalStrings:str("MONTH_" .. date.month)))
+ -- short month format
+ formattedDate = string.gsub(formattedDate, "%%b",
tostring(_globalStrings:str("MONTHSHORT_" .. date.month)))
+
+ -- fill in the remaining items
+ return os.date(formattedDate)
end
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
