From: Eric Fischer Date: Tue, 21 Jul 2009 23:28:30 +0000 (-0700) Subject: Make the "This alarm is set for N hours from now" message more localizable. X-Git-Tag: android-x86-1.6~2^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1bc128fd;p=android-x86%2Fpackages-apps-AlarmClock.git Make the "This alarm is set for N hours from now" message more localizable. It was concatenating the days/minutes/seconds segments together with an "and" string, which works OK in English but not so well in other languages. Bug 1973471 --- diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 55108c1..c90fe0f 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -35,15 +35,10 @@ "Odložit" "Upozornění odloženo o %d min." "Upozornění nebylo odloženo – další upozornění v %s." - "Tento budík bude aktivován za: %s." - "%1$s%2$s%3$s%4$s%5$s" "1 den" "dní: %s" "1 hodina" "%s hod." - " a " - " " - "méně než 1 minuta" "1 minuta" "%s min" "Každý den" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index f6fb0ed..5c18441 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -35,15 +35,10 @@ "Slumretilstand" "Slumrer i %d minutter." "Der er ikke indstillet slumretilstand. Næste alarm er indstillet til %s" - "Alarmen er indstillet til %s fra nu af." - "%1$s%2$s%3$s%4$s%5$s" "1 dag" "%s dage" "1 time" "%s timer" - " og " - " " - "mindre end 1 minut" "1 minut" "%s minutter" "hver dag" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 9749484..773a98a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -35,15 +35,10 @@ "Snooze-Funktion" "Snooze-Funktion aktiviert für %d Minuten" "Snooze-Funktion nicht aktiviert - nächster Wecker klingelt %s." - "Dieser Wecker klingelt in %s." - "%1$s%2$s%3$s%4$s%5$s" "1 Tag" "%s Tagen" "1 Stunde" "%s Stunden" - " und " - " " - "weniger als 1 Minute" "1 Minute" "%s Minuten" "Täglich" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 94d9cb5..6f91b51 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -35,15 +35,10 @@ "Αναβολή αφύπνισης" "Αναβολή αφύπνισης για %d λεπτά." "Δεν έχει οριστεί η αναβολή αφύπνισης -- το επόμενο ξυπνητήρι έχει οριστεί στις %s" - "Το ξυπνητήρι αυτό έχει οριστεί σε %s από τώρα." - "%1$s%2$s%3$s%4$s%5$s" "1 ημέρα" "%s ημέρες" "1 ώρα" "%s ώρες" - " και " - " " - "σε λιγότερο από 1 λεπτό" "1 λεπτό" "%s λεπτά" "κάθε μέρα" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 4cad3ad..4cf2715 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -35,15 +35,10 @@ "Recurrente" "Recurrente a los %d minutos." "Alarma recurrente no activada. Próxima alarma fijada a las %s" - "Esta alarma se activará en %s a partir de ahora." - "Segmento %1$s%2$s%3$s%4$s%5$s" "un día" "%s días" "1 hora" "%s horas" - " y " - " Segmento " - "menos de 1 minuto" "1 minuto" "%s minutos" "todos los días" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index f6843a0..60d33b4 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -35,15 +35,10 @@ "Posponer" "La alarma volverá a sonar en %d minutos." "No se ha pospuesto la alarma, ya que la siguiente alarma sonará a las %s." - "La alarma sonará en %s." - "%1$s%2$s%3$s%4$s%5$s" "1 día" "%s días" "1 hora" "%s horas" - " y " - " " - "menos de 1 minuto" "1 minuto" "%s minutos" "todos los días" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 0977be9..724f89a 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -35,15 +35,10 @@ "Répéter" "Répétition dans %d minutes." "Répétition non activée : prochaine alarme à %s" - "Prochaine alarme dans %s." - "%1$s%2$s%3$s%4$s%5$s" "1 jour" "%s jours" "1 heure" "%s heures" - " et " - " " - "moins d\'une minute" "1 minute" "%s minutes" "Tous les jours" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b098dca..e75b4d3 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -35,15 +35,10 @@ "Posponi" "Sospensione per %d minuti." "Sospensione non impostata. Prossimo allarme alle %s" - "L\'allarme sarà attivato fra %s." - "%1$s%2$s%3$s%4$s%5$s" "1 giorno" "%s giorni" "1 ora" "%s ore" - " e " - " " - "meno di 1 minuto" "1 minuto" "%s minuti" "Ogni giorno" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 9f11e6b..03e14f8 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -35,15 +35,10 @@ "スヌーズ" "%d分後に再通知します" "スヌーズにできません: %sに次のアラームが設定されています" - "今から%s後に設定しました" - "%1$s%2$s%3$s%4$s%5$s" "1日" "%s日" "1時間" "%s時間" - " と " - " " - "数十秒" "1分" "%s分" "毎日" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 723192d..947a418 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -35,15 +35,10 @@ "다시 울림" "%d분 동안 알람 일시 중지" "다시 울림을 설정할 수 없음 -- 다음 알람 %s" - "지금부터 %s 후로 알람이 설정됩니다." - "%1$s%2$s%3$s%4$s%5$s" "1일" "%s일" "1시간" "%s시간" - " 및 " - " " - "1분 미만" "1분" "%s분" "매일" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 7fe268d..5a74e53 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -35,16 +35,12 @@ "Slumre" "Slumrer i %d minutter." "Slumrer ikke -- neste alarm vil gå av %s" - "Alarmen vil gå av %s fra nå." "en dag" "%s dager" "en time" "%s timer" - " og " - " " - "mindre enn et minutt" "et minutt" "%s minutter" "hver dag" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 4c30802..86a6907 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -35,15 +35,10 @@ "Snooze" "Snooze is ingesteld op %d minuten." "Snooze is niet ingesteld - volgende alarm is ingesteld op %s" - "Dit alarm is ingesteld op %s vanaf nu." - "%1$s%2$s%3$s%4$s%5$s" "1 dag" "%s dagen" "1 uur" "%s uur" - " en " - " " - "minder dan 1 minuut" "1 minuut" "%s minuten" "elke dag" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 4b702d8..67e71e4 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -35,15 +35,10 @@ "Drzemka" "Drzemka przez %d min." "Nie ustawiono drzemki – następny alarm: %s" - "Ustawiony alarm zadzwoni za %s" - "%1$s%2$s%3$s%4$s%5$s" "1 dzień" "%s dni" "1 godz." "%s godz." - " oraz " - " " - "mniej niż 1 min" "1 min" "%s min" "codziennie" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 0efd3eb..3c9285f 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -35,15 +35,10 @@ "Suspender" "Suspenso por %d minutos." "Suspensão não definida -- próximo alarme definido para as %s" - "Este·alarme·dispara·daqui·a %s." - "%1$s%2$s%3$s%4$s%5$s" "1 dia" "%s dias" "1 hora" "%s horas" - " e " - " " - "menos de 1 minuto" "1 minuto" "%s minutos" "todos os dias" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index cd670b9..671e208 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -35,15 +35,10 @@ "Colocar em modo de espera" "Em espera por %d minutos." "Modo de espera não definido. Próximo alarme definido para %s" - "Este alarme está definido para daqui a %s." - "%1$s%2$s%3$s%4$s%5$s" "1 dia" "%s dias" "1 hora" "%s horas" - " e " - " " - "menos de 1 minuto" "1 minuto" "%s minutos" "todos os dias" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 6c797e0..b1ecba8 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -35,15 +35,10 @@ "Спящий режим" "Отсрочка будильника на %d мин." "Отсрочка будильника не установлена – следующий сигнал прозвучит в %s" - "Будильник зазвонит через %s." - "%1$s%2$s%3$s%4$s%5$s" "1 день" "%s дн." "1 час" "%s ч." - " и " - " " - "меньше 1 минуты" "1 минута" "%s мин." "каждый день" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 845f49a..83e9c22 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -35,15 +35,10 @@ "Snooze" "Snoozar i %d minuter." "Ingen snooze – nästa alarm ringer %s" - "Alarmet ringer om %s från och med nu." - "%1$s%2$s%3$s%4$s%5$s" "1 dag" "%s dagar" "1 timme" "%s timmar" - " och " - " " - "mindre än 1 minut" "1 minut" "%s minuter" "Varje dag" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 63cb699..9dde70a 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -35,15 +35,10 @@ "Duraklat" "%d dakika duraklatılıyor." "Duraklama ayarlanmadı -- sonraki alarm %s olarak ayarlandı" - "Bu alarmın çalmasına şu andan itibaren %s var." - "%1$s%2$s%3$s%4$s%5$s" "1 gün" "%s gün" "1 saat" "%s saat" - " ve " - " " - "1 dakikadan az" "1 dakika" "%s dakika" "her gün" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 38f88a2..28fea35 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -35,15 +35,10 @@ "暂停" "暂停 %d 分钟。" "无法设置暂停 - 下一个闹钟已设置为在 %s后提醒" - "该闹钟设置为从现在起 %s后再提醒。" - "%1$s%2$s%3$s%4$s%5$s" "1 天" "%s 天" "1 小时" "%s 小时" - " 和 " - " " - "少于 1 分钟" "1 分钟" "%s 分钟" "每天" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 7192106..dc8724d 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -35,15 +35,10 @@ "貪睡" "再貪睡 %d 分鐘。" "未設定貪睡鬧鐘 -- 下一次鬧鐘時間為 %s" - "還有 %s 會啟動鬧鐘。" - "%1$s%2$s%3$s%4$s%5$s" "1 天" "%s 天" "1 小時" "%s 小時" - " 又 " - " " - "少於 1 分鐘" "1 分鐘" "%s 分鐘" "每天" diff --git a/res/values/strings.xml b/res/values/strings.xml index 5bab3e8..c7033a2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -83,14 +83,28 @@ alarm set for xxx." --> Snooze not set -- next alarm set for %s + - This alarm is set for %s from now. - - - %1$s%2$s%3$s%4$s%5$s + + This alarm is set for less than 1 minute from now. + This alarm is set for %1$s from now. + This alarm is set for %2$s from now. + This alarm is set for %1$s and %2$s from now. + This alarm is set for %3$s from now. + This alarm is set for %1$s and %3$s from now. + This alarm is set for %2$s and %3$s from now. + This alarm is set for %1$s, %2$s, and %3$s from now. + "1 day" @@ -104,15 +118,6 @@ %s hours - - " and " - - - " " - - - "less than 1 minute" - "1 minute" diff --git a/src/com/android/alarmclock/SetAlarm.java b/src/com/android/alarmclock/SetAlarm.java index 807b469..c141812 100644 --- a/src/com/android/alarmclock/SetAlarm.java +++ b/src/com/android/alarmclock/SetAlarm.java @@ -347,26 +347,12 @@ public class SetAlarm extends PreferenceActivity boolean dispHour = hours > 0; boolean dispMinute = minutes > 0; - String ret; - if (!(dispDays || dispHour || dispMinute)) { - ret = context.getString(R.string.subminute); - } else { - String parts[] = new String[5]; - parts[0] = daySeq; - parts[1] = !dispDays ? "" : - dispHour && dispMinute ? context.getString(R.string.space) : - !dispHour && !dispMinute ? "" : - context.getString(R.string.and); - parts[2] = dispHour ? hourSeq : ""; - parts[3] = dispHour && dispMinute ? context.getString(R.string.and) : ""; - parts[4] = dispMinute ? minSeq : ""; - ret = context.getString(R.string.combiner, (Object[])parts); - } + int index = (dispDays ? 1 : 0) | + (dispHour ? 2 : 0) | + (dispMinute ? 4 : 0); - ret = context.getString(R.string.alarm_set, ret); - /* if (Log.LOGV) Log.v("** TOAST daySeq " + daySeq + " hourSeq " + hourSeq + - " minSeq " + minSeq + " ret " + ret); */ - return ret; + String[] formats = context.getResources().getStringArray(R.array.alarm_set); + return String.format(formats[index], daySeq, hourSeq, minSeq); } public boolean onCreateOptionsMenu(Menu menu) {