Skip to content

Added support for ISO dates #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MacL3an wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for ISO dates #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions resources/settings/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,9 @@
<listEntry value="2">@Strings.datef21</listEntry>
<listEntry value="3">@Strings.datef3</listEntry>
<listEntry value="4">@Strings.datef31</listEntry>
<listEntry value="5">@Strings.datef4</listEntry>
<listEntry value="6">@Strings.datef41</listEntry>
<listEntry value="5">@Strings.datef32</listEntry>
<listEntry value="6">@Strings.datef4</listEntry>
<listEntry value="7">@Strings.datef41</listEntry>
</settingConfig>
</setting>
<setting propertyKey="@Properties.force_date_english" title="@Strings.force_date_english">
Expand Down
15 changes: 8 additions & 7 deletions resources/strings/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,14 @@
<string id="wind">Wind (Kmph or Mph)</string>

<string id="date_format">Date format</string>
<string id="datef1">ddd d (TUE 2)</string>
<string id="datef2">dd.mm (2.9)</string>
<string id="datef21">mm.dd (9.2)</string>
<string id="datef3">dd.mm.yy (2.9.19)</string>
<string id="datef31">mm.dd.yy (9.2.19)</string>
<string id="datef4">dd mmm (2 OCT)</string>
<string id="datef41">mmm dd (OCT 2)</string>
<string id="datef1">ddd d (TUE 31)</string>
<string id="datef2">dd.mm (31.9)</string>
<string id="datef21">mm.dd (9.31)</string>
<string id="datef3">dd.mm.yy (31.9.19)</string>
<string id="datef31">mm.dd.yy (9.31.19)</string>
<string id="datef32">yy.mm.dd (19.9.31)</string>
<string id="datef4">dd mmm (31 OCT)</string>
<string id="datef41">mmm dd (OCT 31)</string>

<string id="utc_timezone">Secondary timezone</string>
<string id="utc_shift">Shift timezone for +30min</string>
Expand Down
24 changes: 13 additions & 11 deletions source/HuwaiiApp.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,19 +237,21 @@ class HuwaiiApp extends Application.AppBase {
} else if (date_formater == 2) {
// mm/dd
return Lang.format("$1$.$2$",[date.month.format("%d"), date.day.format("%d")]);
} else if (date_formater == 3) {
// dd/mm/yyyy
} else if (date_formater == 3 || date_formater == 4 || date_formater == 5) {
var year = date.year;
var yy = year/100.0;
yy = Math.round((yy-yy.toNumber())*100.0);
return Lang.format("$1$.$2$.$3$",[date.day.format("%d"), date.month.format("%d"), yy.format("%d")]);
} else if (date_formater == 4) {
// mm/dd/yyyy
var year = date.year;
var yy = year/100.0;
yy = Math.round((yy-yy.toNumber())*100.0);
return Lang.format("$1$.$2$.$3$",[date.month.format("%d"), date.day.format("%d"), yy.format("%d")]);
} else if (date_formater == 5 || date_formater == 6) {
if (date_formater == 3) {
// dd.mm.yy
return Lang.format("$1$.$2$.$3$",[date.day.format("%d"), date.month.format("%d"), yy.format("%d")]);
} else if (date_formater == 4) {
// mm.dd.yy
return Lang.format("$2$.$1$.$3$",[date.day.format("%d"), date.month.format("%d"), yy.format("%d")]);
} else {
// yy.mm.dd
return Lang.format("$3$.$2$.$1$",[date.day.format("%d"), date.month.format("%d"), yy.format("%d")]);
}
} else if (date_formater == 6 || date_formater == 7) {
// dd mmm
var day = null;
var month = null;
Expand All @@ -261,7 +263,7 @@ class HuwaiiApp extends Application.AppBase {
day = date.day;
month = months[date.month];
}
if (date_formater == 5) {
if (date_formater == 6) {
return Lang.format("$1$ $2$",[day.format("%d"), month]);
} else {
return Lang.format("$1$ $2$",[month, day.format("%d")]);
Expand Down