Skip to content
This repository was archived by the owner on May 3, 2021. It is now read-only.

Support spanish language #8

Merged
merged 3 commits into from
Nov 3, 2018
Merged

Support spanish language #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81a5ecf
Added case for Spanish and extract repeat switch case into a function
amian84 Nov 3, 2018
2e4a7bf
Added new lang options for Spanish
amian84 Nov 3, 2018
5f91629
Added strings for spanish lang
amian84 Nov 3, 2018
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
176 changes: 46 additions & 130 deletions app/src/main/java/com/layoutxml/twelveish/MyWatchFace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,14 @@ private void loadPreferences() {
PrefixNewLine = new Boolean[]{false,false,true,true,true,true,true,true,true,false,true,true};
SuffixNewLine = new Boolean[]{true,true,true,true,true,true,true,true,true,true,false,false};
break;
case "es":
Prefixes = getResources().getStringArray(R.array.PrefixesES);
Suffixes = getResources().getStringArray(R.array.SuffixesES);
WeekDays = getResources().getStringArray(R.array.WeekDaysES);
TimeShift = new Integer[]{0,0,0,0,0,0,0,0,1,1,1,1};
PrefixNewLine = new Boolean[]{false,false,true,false,false,true,false,false,false,false,false,true};
SuffixNewLine = new Boolean[]{false,true,true,true,true,true,true,true,true,true,true,false};
break;
default:
Prefixes = getResources().getStringArray(R.array.Prefixes);
Suffixes = getResources().getStringArray(R.array.Suffixes);
Expand Down Expand Up @@ -896,6 +904,39 @@ else if (hourText>12 && !militaryTextTime)
drawComplications(canvas,now);
}

private String getExactTime(Integer hours){
String exactTime= "";
switch (language) {
case "en":
exactTime = getResources().getStringArray(R.array.ExactTimes)[hours];
break;
case "de":
exactTime = getResources().getStringArray(R.array.ExactTimesDE)[hours];
break;
case "lt":
exactTime = getResources().getStringArray(R.array.ExactTimesLT)[hours];
break;
case "fi":
exactTime = getResources().getStringArray(R.array.ExactTimesFI)[hours];
break;
case "ru":
exactTime = getResources().getStringArray(R.array.ExactTimesRU)[hours];
break;
case "hu":
exactTime = getResources().getStringArray(R.array.ExactTimesHU)[hours];
break;
case "it":
exactTime = getResources().getStringArray(R.array.ExactTimesIT)[hours];
break;
case "es":
exactTime = getResources().getStringArray(R.array.ExactTimesES)[hours];
break;
default:
exactTime = getResources().getStringArray(R.array.ExactTimes)[hours];
}
return exactTime;
}

private String capitalise0(Integer hours, Integer minutes, Integer index){
//Prefix
String mainPrefix = "";
Expand All @@ -915,33 +956,8 @@ private String capitalise0(Integer hours, Integer minutes, Integer index){
//Time
StringBuilder hoursInWords = new StringBuilder();
String mainText;
String[] mainArray;
switch (language) {
case "en":
mainArray = getResources().getStringArray(R.array.ExactTimes)[hours].split(" ");
break;
case "de":
mainArray = getResources().getStringArray(R.array.ExactTimesDE)[hours].split(" ");
break;
case "lt":
mainArray = getResources().getStringArray(R.array.ExactTimesLT)[hours].split(" ");
break;
case "fi":
mainArray = getResources().getStringArray(R.array.ExactTimesFI)[hours].split(" ");
break;
case "ru":
mainArray = getResources().getStringArray(R.array.ExactTimesRU)[hours].split(" ");
break;
case "hu":
mainArray = getResources().getStringArray(R.array.ExactTimesHU)[hours].split(" ");
break;
case "it":
mainArray = getResources().getStringArray(R.array.ExactTimesIT)[hours].split(" ");
break;
default:
mainArray = getResources().getStringArray(R.array.ExactTimes)[hours].split(" ");
String[] mainArray = getExactTime(hours).split(" ");

}
for (String word : mainArray) {
if (hoursInWords.length()!=0) {
hoursInWords.append(" ");
Expand Down Expand Up @@ -983,32 +999,7 @@ private String capitalise0(Integer hours, Integer minutes, Integer index){
}

private String capitalise1(Integer hours, Integer minutes, Integer index) {
String middle;
switch (language) {
case "en":
middle = getResources().getStringArray(R.array.ExactTimes)[hours];
break;
case "de":
middle = getResources().getStringArray(R.array.ExactTimesDE)[hours];
break;
case "lt":
middle = getResources().getStringArray(R.array.ExactTimesLT)[hours];
break;
case "fi":
middle = getResources().getStringArray(R.array.ExactTimesFI)[hours];
break;
case "ru":
middle = getResources().getStringArray(R.array.ExactTimesRU)[hours];
break;
case "hu":
middle = getResources().getStringArray(R.array.ExactTimesHU)[hours];
break;
case "it":
middle = getResources().getStringArray(R.array.ExactTimesIT)[hours];
break;
default:
middle = getResources().getStringArray(R.array.ExactTimes)[hours];
}
String middle = getExactTime(hours);

if (legacyWords) {
String text =
Expand All @@ -1030,32 +1021,7 @@ private String capitalise1(Integer hours, Integer minutes, Integer index) {
}

private String capitalise2(Integer hours, Integer minutes, Integer index) {
String middle;
switch (language) {
case "en":
middle = getResources().getStringArray(R.array.ExactTimes)[hours];
break;
case "de":
middle = getResources().getStringArray(R.array.ExactTimesDE)[hours];
break;
case "lt":
middle = getResources().getStringArray(R.array.ExactTimesLT)[hours];
break;
case "fi":
middle = getResources().getStringArray(R.array.ExactTimesFI)[hours];
break;
case "ru":
middle = getResources().getStringArray(R.array.ExactTimesRU)[hours];
break;
case "hu":
middle = getResources().getStringArray(R.array.ExactTimesHU)[hours];
break;
case "it":
middle = getResources().getStringArray(R.array.ExactTimesIT)[hours];
break;
default:
middle = getResources().getStringArray(R.array.ExactTimes)[hours];
}
String middle = getExactTime(hours);

if (legacyWords) {
String text =
Expand All @@ -1077,32 +1043,7 @@ private String capitalise2(Integer hours, Integer minutes, Integer index) {
}

private String capitalise3(Integer hours, Integer minutes, Integer index) {
String middle;
switch (language) {
case "en":
middle = getResources().getStringArray(R.array.ExactTimes)[hours];
break;
case "de":
middle = getResources().getStringArray(R.array.ExactTimesDE)[hours];
break;
case "lt":
middle = getResources().getStringArray(R.array.ExactTimesLT)[hours];
break;
case "fi":
middle = getResources().getStringArray(R.array.ExactTimesFI)[hours];
break;
case "ru":
middle = getResources().getStringArray(R.array.ExactTimesRU)[hours];
break;
case "hu":
middle = getResources().getStringArray(R.array.ExactTimesHU)[hours];
break;
case "it":
middle = getResources().getStringArray(R.array.ExactTimesIT)[hours];
break;
default:
middle = getResources().getStringArray(R.array.ExactTimes)[hours];
}
String middle = getExactTime(hours);
if (legacyWords) {
String text20 =
((minutes>0) ? Prefixes[index] : "")
Expand Down Expand Up @@ -1130,32 +1071,7 @@ private String capitalise4(Integer hours, Integer minutes, Integer index) {
}

//Time
String hoursInWords;
switch (language) {
case "en":
hoursInWords = getResources().getStringArray(R.array.ExactTimes)[hours];
break;
case "de":
hoursInWords = getResources().getStringArray(R.array.ExactTimesDE)[hours];
break;
case "lt":
hoursInWords = getResources().getStringArray(R.array.ExactTimesLT)[hours];
break;
case "fi":
hoursInWords = getResources().getStringArray(R.array.ExactTimesFI)[hours];
break;
case "ru":
hoursInWords = getResources().getStringArray(R.array.ExactTimesRU)[hours];
break;
case "hu":
hoursInWords = getResources().getStringArray(R.array.ExactTimesHU)[hours];
break;
case "it":
hoursInWords = getResources().getStringArray(R.array.ExactTimesIT)[hours];
break;
default:
hoursInWords = getResources().getStringArray(R.array.ExactTimes)[hours];
}
String hoursInWords = getExactTime(hours);
String mainText = hoursInWords;

//Suffix
Expand Down
5 changes: 5 additions & 0 deletions .../main/java/com/layoutxml/twelveish/activities/list_activities/StringTextViewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ private void generateLanguageValues(){
option.setSymbol("ru");
values.add(option);

option = new StringOption();
option.setName("Spanish");
option.setSymbol("es");
values.add(option);

mAdapter.notifyDataSetChanged();
}

Expand Down
66 changes: 66 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,4 +493,70 @@
<item>Sa</item>
</string-array>

<string-array name="ExactTimesES">
<item>las doce</item>
<item>las una</item>
<item>las dos</item>
<item>las tres</item>
<item>las cuatro</item>
<item>las cinco</item>
<item>las seis</item>
<item>las siete</item>
<item>las ocho</item>
<item>las nueve</item>
<item>las diez</item>
<item>las once</item>
<item>las doce</item>
<item>las una</item>
<item>las dos</item>
<item>las tres</item>
<item>las cuatro</item>
<item>las cinco</item>
<item>las seis</item>
<item>las siete</item>
<item>las ocho</item>
<item>las nueve</item>
<item>las diez</item>
<item>las once</item>
</string-array>
<string-array name="PrefixesES">
<item/>
<item/>
<item>casi</item>
<item/>
<item/>
<item>casi</item>
<item/>
<item/>
<item/>
<item/>
<item/>
<item>casi</item>
</string-array>
<string-array name="SuffixesES">
<item/>
<item>y cinco</item>
<item>y diez</item>
<item>y cuarto</item>
<item>y veinte</item>
<item>y media</item>
<item>y media</item>
<item>y media pasadas</item>
<item>menos veinte</item>
<item>menos cuarto</item>
<item>menos diez</item>
<item></item>
</string-array>
<string-array name="WeekDaysES">
<item>Do</item>
<item>Lu</item>
<item>Ma</item>
<item>Mie</item>
<item>Ju</item>
<item>Vie</item>
<item>Sa</item>
</string-array>



</resources>