Skip to content

Commit

Permalink
strings
Browse files Browse the repository at this point in the history 
fixes cross-quarter days resource naming scheme to be consistent with astronomical seasons (#719);
`cross_spring` -> `cross-midwinter`,
`cross_summer` -> `cross-midspring`,
`cross_autumnal` -> `cross-midsummer`,
`cross_winter` -> `cross-midautumnal`
  • Loading branch information
@forrestguice
forrestguice committed Jul 7, 2023
1 parent 85ede9b commit b803a1b
Show file tree
Hide file tree
Showing 18 changed files with 336 additions and 336 deletions.
16 changes: 8 additions & 8 deletions app/src/main/java/com/forrestguice/suntimeswidget/settings/WidgetSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1302,23 +1302,23 @@ public void setDisplayStrings(String shortDisplayString, String longDisplayStrin

public static void initDisplayStrings( Context context )
{
CROSS_SPRING.setDisplayStrings(context.getString(R.string.timeMode_cross_spring_short),
context.getString(R.string.timeMode_cross_spring));
CROSS_SPRING.setDisplayStrings(context.getString(R.string.timeMode_cross_midwinter_short),
context.getString(R.string.timeMode_cross_midwinter));
EQUINOX_SPRING.setDisplayStrings(context.getString(R.string.timeMode_equinox_vernal_short),
context.getString(R.string.timeMode_equinox_vernal));

CROSS_SUMMER.setDisplayStrings( context.getString(R.string.timeMode_cross_summer_short),
context.getString(R.string.timeMode_cross_summer));
CROSS_SUMMER.setDisplayStrings( context.getString(R.string.timeMode_cross_midspring_short),
context.getString(R.string.timeMode_cross_midspring));
SOLSTICE_SUMMER.setDisplayStrings( context.getString(R.string.timeMode_solstice_summer_short),
context.getString(R.string.timeMode_solstice_summer));

CROSS_AUTUMN.setDisplayStrings( context.getString(R.string.timeMode_cross_autumnal_short),
context.getString(R.string.timeMode_cross_autumnal) );
CROSS_AUTUMN.setDisplayStrings( context.getString(R.string.timeMode_cross_midsummer_short),
context.getString(R.string.timeMode_cross_midsummer) );
EQUINOX_AUTUMNAL.setDisplayStrings( context.getString(R.string.timeMode_equinox_autumnal_short),
context.getString(R.string.timeMode_equinox_autumnal) );

CROSS_WINTER.setDisplayStrings(context.getString(R.string.timeMode_cross_winter_short),
context.getString(R.string.timeMode_cross_winter));
CROSS_WINTER.setDisplayStrings(context.getString(R.string.timeMode_cross_midautumnal_short),
context.getString(R.string.timeMode_cross_midautumnal));
SOLSTICE_WINTER.setDisplayStrings(context.getString(R.string.timeMode_solstice_winter_short),
context.getString(R.string.timeMode_solstice_winter));
}
Expand Down
40 changes: 20 additions & 20 deletions app/src/main/res/values-ca/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,14 @@
<string name="timeMode_solstice_winter">Solstici d\'hivern</string> <!-- setting -->
<string name="timeMode_solstice_winter_short">Solstici</string> <!-- setting -->

<string name="timeMode_cross_spring">Spring Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_spring_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_autumnal">Autumn Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_autumnal_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_summer">Summer Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_summer_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_winter">Winter Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_winter_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midwinter">Imbolc (Cross-Quarter)</string> <!-- setting --> <!-- cross-quarter in "astronomical winter"; Imbolc, the onset of spring --> <!-- TODO -->
<string name="timeMode_cross_midwinter_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer">Lughnasadh (Cross-Quarter)</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midspring">Beltane (Cross-Quarter)</string> <!-- setting --> <!-- cross-quarter in "astronomical spring"; Beltane, the onset of summer --> <!-- TODO -->
<string name="timeMode_cross_midspring_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal">Samhain (Cross-Quarter)</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->

<string name="timeMode_moon">Lluna</string> <!-- label -->
<string name="timeMode_moon_new">Lluna nova</string> <!-- setting -->
Expand Down Expand Up @@ -1448,10 +1448,10 @@
<item>solstici d\'hivern</item>
<item>Migdia lunar</item>
<item>Mitjanit lunar</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array>
<string-array name="solarevents_long"> <!-- one-to-one with solarevents_short --> <!-- labels; ending may be ellipsed (so the beginning should be distinct) -->
<item>sortida de sol astronòmica</item>
Expand Down Expand Up @@ -1481,10 +1481,10 @@
<item>solstici d\'hivern</item>
<item>Migdia lunar</item>
<item>Mitjanit lunar</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array>
<string-array name="solarevents_long1"> <!-- one-to-one with solarevents_long --> <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
<item>sortida de sol astronòmica</item>
Expand Down Expand Up @@ -1514,10 +1514,10 @@
<item>solstici d\'hivern</item>
<item>Migdia lunar</item>
<item>Mitjanit lunar</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array> <!-- TODO -->

<!-- Dialog: Enable GPS? -->
Expand Down
40 changes: 20 additions & 20 deletions app/src/main/res/values-cs/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,14 @@
<string name="timeMode_solstice_winter">Zimní slunovrat</string> <!-- setting -->
<string name="timeMode_solstice_winter_short">Slunovrat</string> <!-- setting -->

<string name="timeMode_cross_spring">Spring Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_spring_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_autumnal">Autumn Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_autumnal_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_summer">Summer Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_summer_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_winter">Winter Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_winter_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midwinter">Imbolc (Cross-Quarter)</string> <!-- setting --> <!-- cross-quarter in "astronomical winter"; Imbolc, the onset of spring --> <!-- TODO -->
<string name="timeMode_cross_midwinter_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer">Lughnasadh (Cross-Quarter)</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midspring">Beltane (Cross-Quarter)</string> <!-- setting --> <!-- cross-quarter in "astronomical spring"; Beltane, the onset of summer --> <!-- TODO -->
<string name="timeMode_cross_midspring_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal">Samhain (Cross-Quarter)</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->

<string name="timeMode_moon">Měsíc</string> <!-- label -->
<string name="timeMode_moon_new">Nov</string> <!-- setting -->
Expand Down Expand Up @@ -1555,10 +1555,10 @@
<item>zimní slunovrat</item>
<item>lunární poledne</item>
<item>lunární půlnoc</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array>
<string-array name="solarevents_long"> <!-- one-to-one with solarevents_short --> <!-- labels; ending may be ellipsed (so the beginning should be distinct) -->
<item>ranní astronomický soumrak (začátek)</item>
Expand Down Expand Up @@ -1588,10 +1588,10 @@
<item>zimní slunovrat</item>
<item>lunární poledne</item>
<item>lunární půlnoc</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array>
<string-array name="solarevents_long1"> <!-- one-to-one with solarevents_long --> <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
<item>ranní astronomický soumrak (začátek)</item>
Expand Down Expand Up @@ -1621,10 +1621,10 @@
<item>zimní slunovrat</item>
<item>lunární poledne</item>
<item>lunární půlnoc</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array>

<!-- Dialog: Enable GPS? -->
Expand Down
40 changes: 20 additions & 20 deletions app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,14 @@
<string name="timeMode_solstice_winter">Wintersonnenwende</string> <!-- setting -->
<string name="timeMode_solstice_winter_short">Sonnenwende</string> <!-- setting -->

<string name="timeMode_cross_spring">Spring Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_spring_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_autumnal">Autumn Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_autumnal_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_summer">Summer Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_summer_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_winter">Winter Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_winter_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midwinter">Imbolc (Cross-Quarter)</string> <!-- setting --> <!-- cross-quarter in "astronomical winter"; Imbolc, the onset of spring --> <!-- TODO -->
<string name="timeMode_cross_midwinter_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer">Lughnasadh (Cross-Quarter)</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midspring">Beltane (Cross-Quarter)</string> <!-- setting --> <!-- cross-quarter in "astronomical spring"; Beltane, the onset of summer --> <!-- TODO -->
<string name="timeMode_cross_midspring_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal">Samhain (Cross-Quarter)</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal_short">Cross-Quarter</string> <!-- setting --> <!-- TODO -->

<string name="timeMode_moon">Mond</string> <!-- label -->
<string name="timeMode_moon_new">Neumond</string> <!-- setting -->
Expand Down Expand Up @@ -1438,10 +1438,10 @@
<item>Wintersonnenwende</item>
<item>Mondmittag</item>
<item>Mondmitternacht</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array>
<string-array name="solarevents_long"> <!-- one-to-one with solarevents_short --> <!-- labels; ending may be ellipsed (so the beginning should be distinct) -->
<item>Astronomische Morgendämmerung (Beginn)</item>
Expand Down Expand Up @@ -1471,10 +1471,10 @@
<item>Wintersonnenwende</item>
<item>Mondmittag</item>
<item>Mondmitternacht</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array>
<string-array name="solarevents_long1"> <!-- one-to-one with solarevents_long --> <!-- natural sounding phrases (nouns); used with solarevents_gender/quantity and SelectFormat patterns (e.g. offset_before_msg1) -->
<item>Astronomische Morgendämmerung (Beginn)</item>
Expand Down Expand Up @@ -1504,10 +1504,10 @@
<item>Wintersonnenwende</item>
<item>Mondmittag</item>
<item>Mondmitternacht</item>
<item>@string/timeMode_cross_spring</item>
<item>@string/timeMode_cross_summer</item>
<item>@string/timeMode_cross_autumnal</item>
<item>@string/timeMode_cross_winter</item>
<item>@string/timeMode_cross_midwinter</item>
<item>@string/timeMode_cross_midspring</item>
<item>@string/timeMode_cross_midsummer</item>
<item>@string/timeMode_cross_midautumnal</item>
</string-array> <!-- TODO: review -->

<!-- Dialog: Enable GPS? -->
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/values-eo/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,14 +346,14 @@
<string name="timeMode_solstice_winter">Vintra sunekstremo</string> <!-- setting -->
<string name="timeMode_solstice_winter_short">Solstico</string> <!-- setting -->

<string name="timeMode_cross_spring">Mezo de printempo</string> <!-- setting -->
<string name="timeMode_cross_spring_short">Printemp-mezo</string> <!-- setting -->
<string name="timeMode_cross_autumnal">Mezo de aŭtuno</string> <!-- setting -->
<string name="timeMode_cross_autumnal_short">Aŭtun-mezo</string> <!-- setting -->
<string name="timeMode_cross_summer">Somer-mezo</string> <!-- setting -->
<string name="timeMode_cross_summer_short">Somer-mezo</string> <!-- setting -->
<string name="timeMode_cross_winter">Mezo de vintro</string> <!-- setting -->
<string name="timeMode_cross_winter_short">Vintr-mezo</string> <!-- setting -->
<string name="timeMode_cross_midwinter">Mezo de printempo</string> <!-- setting --> <!-- TODO; "Spring Cross-Quarter" to either "Imbolc (Cross-Quarter), or "Mid-Winter (Cross-Quarter)" -->
<string name="timeMode_cross_midwinter_short">Printemp-mezo</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer">Mezo de aŭtuno</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midsummer_short">Aŭtun-mezo</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midspring">Somer-mezo</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midspring_short">Somer-mezo</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal">Mezo de vintro</string> <!-- setting --> <!-- TODO -->
<string name="timeMode_cross_midautumnal_short">Vintr-mezo</string> <!-- setting --> <!-- TODO -->

<string name="timeMode_moon">Luno</string> <!-- label -->
<string name="timeMode_moon_new">Nova Luno</string> <!-- setting -->
Expand Down
Loading

2 comments on commit b803a1b

@forrestguice
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jamesliu96 @verdulo @naoliv Unfortunately I think I've made a mess of these cross-quarter day labels (#719), and the current translations will probably need to be changed.

To clarify, timeMode_cross_midwinter (previously named timeMode_cross_spring), is the cross-quarter day occurring mid-astronomical-winter, signifying the coming of spring, aka "Imbolc".
Instead of calling this "Spring Cross-Quarter" (ambiguous), the app now calls this "Imbolc (Cross-Quarter)".

@jamesliu96
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#728

Please sign in to comment.