Skip to content
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

change "a/p" to "am/pm" #199

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

change "a/p" to "am/pm" #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a9372
fix sunrise when it's tomorrow
flocsy Jul 4, 2021
ad4bf28
change a/p to am/pm
flocsy Jul 4, 2021
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
2 changes: 1 addition & 1 deletion resources-fr920xt/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<font id="MinutesFont" filename="../../resources-rectangle-205x148/fonts/titillium-web-light-54.fnt" antialias="false"/>

<!-- Manually symlinked from resources-small-time/fonts. -->
<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789AP"/>
<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789APM"/>

<!-- Manually symlinked from resources/fonts. -->
<font id="DateFont" filename="../../resources/fonts/titillium-web-semibold-16.fnt" antialias="false" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
Expand Down
2 changes: 1 addition & 1 deletion resources-rectangle-205x148/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<font id="MinutesFont" filename="titillium-web-light-54.fnt" antialias="true" />

<!-- Same SecondsFont and DateFont as resources-small-time -->
<!--font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789AP"/-->
<!--font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789APM"/-->

<!-- Manually symlinked from resources/fonts. -->
<!-- Select date glyphs from titillium-web-semibold-16.fnt -->
Expand Down
4 changes: 2 additions & 2 deletions resources-rectangle-240x240/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<fonts>
<font id="HoursFont" filename="../../resources-round-260x260/fonts/titillium-web-bold-74-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="../../resources-round-260x260/fonts/titillium-web-light-74-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>

<!-- Locale-specific manual date font overrides, because fonts cannot automatically be overridden by locale -->
Expand All @@ -14,7 +14,7 @@
<!-- Always on fonts -->
<font id="AlwaysOnHoursFont" filename="../../resources-rectangle-205x148/fonts/titillium-web-bold-54.fnt" antialias="true"/>
<font id="AlwaysOnMinutesFont" filename="../../resources-rectangle-205x148/fonts/titillium-web-light-54.fnt" antialias="true"/>
<font id="AlwaysOnSecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
<font id="AlwaysOnSecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
<font id="AlwaysOnDateFont" filename="../../resources/fonts/titillium-web-semibold-16.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources-rectangle-205x148/fonts/noto-sans-cjk-sc-medium-16.fnt" antialias="true"/>
<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources-rectangle-205x148/fonts/noto-sans-cjk-tc-medium-16.fnt" antialias="true"/>
Expand Down
2 changes: 1 addition & 1 deletion resources-round-208x208/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="../../resources-small-time/fonts/titillium-web-bold-58-tall.fnt" antialias="false"/>
<font id="MinutesFont" filename="../../resources-small-time/fonts/titillium-web-light-58-tall.fnt" antialias="false"/>
<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789AP"/>
<font id="SecondsFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter="0123456789APM"/>
<font id="DateFont" filename="../../resources-small-time/fonts/titillium-web-semibold-20.fnt" antialias="false" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>

<font id="NormalFont" filename="../../resources/fonts/titillium-web-semibold-16.fnt" antialias="false" filter="%-.0123456789!:?CFabefgikmpsty°"/>
Expand Down
2 changes: 1 addition & 1 deletion resources-round-260x260/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="titillium-web-bold-74-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="titillium-web-light-74-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="titillium-web-semibold-26.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="titillium-web-semibold-26.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="titillium-web-semibold-26.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>

<!-- Locale-specific manual date font overrides, because fonts cannot automatically be overridden by locale -->
Expand Down
2 changes: 1 addition & 1 deletion resources-round-280x280/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="titillium-web-bold-80-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="titillium-web-light-80-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="titillium-web-semibold-28.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="titillium-web-semibold-28.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="titillium-web-semibold-28.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
<font id="NormalFont" filename="titillium-web-semibold-18.fnt" antialias="true" filter="%-.0123456789!:?CFabefgikmpsty°"/>
<font id="NormalFontCities" filename="titillium-web-semibold-18.fnt" antialias="true" filter=" %',-.0123456789!:?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz°ÅÍÎÖáãäåæèéíðñóôöøûüž"/>
Expand Down
4 changes: 2 additions & 2 deletions resources-round-360x360/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="titillium-web-bold-102-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="titillium-web-light-102-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="titillium-web-semibold-36.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="titillium-web-semibold-36.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="titillium-web-semibold-36.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>

<!-- Manually symlinked from /fonts. -->
Expand All @@ -26,7 +26,7 @@
<!-- Date/battery fonts should strictly be 22px, but keep number of fonts to a sensible minimum -->
<font id="AlwaysOnHoursFont" filename="../../resources-round-260x260/fonts/titillium-web-bold-74-tall.fnt" antialias="true"/>
<font id="AlwaysOnMinutesFont" filename="../../resources-round-260x260/fonts/titillium-web-light-74-tall.fnt" antialias="true"/>
<font id="AlwaysOnSecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
<font id="AlwaysOnSecondsFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
<font id="AlwaysOnDateFont" filename="../../resources/fonts/titillium-web-semibold-24.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources/fonts/noto-sans-cjk-sc-medium-24.fnt" antialias="true"/>
<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources/fonts/noto-sans-cjk-tc-medium-24.fnt" antialias="true"/>
Expand Down
4 changes: 2 additions & 2 deletions resources-round-390x390/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="titillium-web-bold-110-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="titillium-web-light-110-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="titillium-web-semibold-39.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="titillium-web-semibold-39.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="titillium-web-semibold-39.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>

<!-- Manually symlinked from resources-round-260x260/fonts. -->
Expand All @@ -24,7 +24,7 @@
<!-- Always on fonts -->
<font id="AlwaysOnHoursFont" filename="../../resources-round-280x280/fonts/titillium-web-bold-80-tall.fnt" antialias="true"/>
<font id="AlwaysOnMinutesFont" filename="../../resources-round-280x280/fonts/titillium-web-light-80-tall.fnt" antialias="true"/>
<font id="AlwaysOnSecondsFont" filename="../../resources-round-280x280/fonts/titillium-web-semibold-28.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
<font id="AlwaysOnSecondsFont" filename="../../resources-round-280x280/fonts/titillium-web-semibold-28.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
<font id="AlwaysOnDateFont" filename="../../resources/fonts/titillium-web-semibold-24.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources/fonts/noto-sans-cjk-sc-medium-24.fnt" antialias="true"/>
<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources/fonts/noto-sans-cjk-tc-medium-24.fnt" antialias="true"/>
Expand Down
4 changes: 2 additions & 2 deletions resources-round-416x416/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="titillium-web-bold-118-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="titillium-web-light-118-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="titillium-web-semibold-42.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="titillium-web-semibold-42.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="titillium-web-semibold-42.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>

<!-- Manually symlinked from resources-round-280x280/fonts. -->
Expand All @@ -25,7 +25,7 @@
<!-- Always on fonts -->
<font id="AlwaysOnHoursFont" filename="titillium-web-bold-85-tall.fnt" antialias="true"/>
<font id="AlwaysOnMinutesFont" filename="titillium-web-light-85-tall.fnt" antialias="true"/>
<font id="AlwaysOnSecondsFont" filename="titillium-web-semibold-30.fnt" antialias="true" filter="AP"/> <!-- AM/PM only -->
<font id="AlwaysOnSecondsFont" filename="titillium-web-semibold-30.fnt" antialias="true" filter="APM"/> <!-- AM/PM only -->
<font id="AlwaysOnDateFont" filename="../../resources-round-260x260/fonts/titillium-web-semibold-26.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
<font id="AlwaysOnDateFontOverrideZHS" filename="../../resources-round-260x260/fonts/noto-sans-cjk-sc-medium-26.fnt" antialias="true"/>
<font id="AlwaysOnDateFontOverrideZHT" filename="../../resources-round-260x260/fonts/noto-sans-cjk-tc-medium-26.fnt" antialias="true"/>
Expand Down
2 changes: 1 addition & 1 deletion resources-small-time/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="titillium-web-bold-58-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="titillium-web-light-58-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="titillium-web-semibold-20.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>

<!-- Locale-specific manual date font overrides, because fonts cannot automatically be overridden by locale -->
Expand Down
2 changes: 1 addition & 1 deletion resources/fonts/fonts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<fonts>
<font id="HoursFont" filename="titillium-web-bold-68-tall.fnt" antialias="true"/>
<font id="MinutesFont" filename="titillium-web-light-68-tall.fnt" antialias="true"/>
<font id="SecondsFont" filename="titillium-web-semibold-24.fnt" antialias="true" filter="0123456789AP"/>
<font id="SecondsFont" filename="titillium-web-semibold-24.fnt" antialias="true" filter="0123456789APM"/>
<font id="DateFont" filename="titillium-web-semibold-24.fnt" antialias="true" filter=" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÁÄÅÉÍÖØÚČĚŘŚŠŹŽ"/>
<font id="NormalFont" filename="titillium-web-semibold-16.fnt" antialias="true" filter="%-.0123456789!:?CFabefgikmpsty°"/>
<font id="NormalFontCities" filename="titillium-web-semibold-16.fnt" antialias="true" filter=" %',-.0123456789!:?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz°ÅÍÎÖáãäåæèéíðñóôöøûüž"/>
Expand Down
4 changes: 2 additions & 2 deletions source/CrystalApp.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,14 @@ class CrystalApp extends App.AppBase {
if (hour > 12) {
hour = hour - 12;
}
amPm = "p";
amPm = "pm";
} else {

// #27 Ensure midnight is shown as 12, not 00.
if (hour == 0) {
hour = 12;
}
amPm = "a";
amPm = "am";
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/DataFields.mc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ class DataFields extends Ui.Drawable {
if (tomorrow) {
now = now.add(new Time.Duration(24 * 60 * 60));
}
var d = Gregorian.info(Time.now(), Time.FORMAT_SHORT);
var d = Gregorian.info(now, Time.FORMAT_SHORT);
var rad = Math.PI / 180.0d;
var deg = 180.0d / Math.PI;

Expand Down