From 81a5ecf571b3877686141926a512275f56d130bf Mon Sep 17 00:00:00 2001 From: David Amian Date: Sat, 3 Nov 2018 21:40:30 +0100 Subject: [PATCH 1/3] Added case for Spanish and extract repeat switch case into a function --- .../com/layoutxml/twelveish/MyWatchFace.java | 176 +++++------------- 1 file changed, 46 insertions(+), 130 deletions(-) diff --git a/app/src/main/java/com/layoutxml/twelveish/MyWatchFace.java b/app/src/main/java/com/layoutxml/twelveish/MyWatchFace.java index ae7ebee..58710b8 100644 --- a/app/src/main/java/com/layoutxml/twelveish/MyWatchFace.java +++ b/app/src/main/java/com/layoutxml/twelveish/MyWatchFace.java @@ -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); @@ -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 = ""; @@ -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(" "); @@ -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 = @@ -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 = @@ -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] : "") @@ -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 From 2e4a7bfee34bf3e0ebedf1c38f612bc40d807c3d Mon Sep 17 00:00:00 2001 From: David Amian Date: Sat, 3 Nov 2018 21:41:01 +0100 Subject: [PATCH 2/3] Added new lang options for Spanish --- .../activities/list_activities/StringTextViewActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/layoutxml/twelveish/activities/list_activities/StringTextViewActivity.java b/app/src/main/java/com/layoutxml/twelveish/activities/list_activities/StringTextViewActivity.java index 788e7e9..143edf2 100644 --- a/app/src/main/java/com/layoutxml/twelveish/activities/list_activities/StringTextViewActivity.java +++ b/app/src/main/java/com/layoutxml/twelveish/activities/list_activities/StringTextViewActivity.java @@ -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(); } From 5f91629b034ad153795cd847d719ac84fda85336 Mon Sep 17 00:00:00 2001 From: David Amian Date: Sat, 3 Nov 2018 21:41:40 +0100 Subject: [PATCH 3/3] Added strings for spanish lang --- app/src/main/res/values/strings.xml | 66 +++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e5c9fa7..df202db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -493,4 +493,70 @@ Sa + + las doce + las una + las dos + las tres + las cuatro + las cinco + las seis + las siete + las ocho + las nueve + las diez + las once + las doce + las una + las dos + las tres + las cuatro + las cinco + las seis + las siete + las ocho + las nueve + las diez + las once + + + + + casi + + + casi + + + + + + casi + + + + y cinco + y diez + y cuarto + y veinte + y media + y media + y media pasadas + menos veinte + menos cuarto + menos diez + + + + Do + Lu + Ma + Mie + Ju + Vie + Sa + + + +