Author: ks156
Date: 2009-10-21 13:23:33 +0200 (Wed, 21 Oct 2009)
New Revision: 5760
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Added exception for 23h45, 00h15, 00h30, 11h45, 12h15 and 12h30.
* Added the dutch translations
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
===================================================================
---
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
2009-10-21 10:06:28 UTC (rev 5759)
+++
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
2009-10-21 11:23:33 UTC (rev 5760)
@@ -49,15 +49,33 @@
msgid "It's a quarter after {0}"
msgstr "It's a quarter after {0}"
+msgid "It's quarter past midnight"
+msgstr "It's quarter past midnight"
+
+msgid "It's quarter past noon"
+msgstr "It's quarter past noon"
+
msgid "It's quarter to {0}"
msgstr "It's quarter to {0}"
msgid "It's a quarter until {0}"
msgstr "It's a quarter until {0}"
+msgid "It's quarter to midnight"
+msgstr "It's quarter to midnight"
+
+msgid "It's quarter to noon"
+msgstr "It's quarter to noon"
+
msgid "It's half past {0}"
msgstr "It's half past {0}"
+msgid "It's half past midnight"
+msgstr "It's half past midnight"
+
+msgid "It's half past noon"
+msgstr "It's half past noon"
+
msgid "Start every x from full hour"
msgstr "Alerts"
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
===================================================================
---
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
2009-10-21 10:06:28 UTC (rev 5759)
+++
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
2009-10-21 11:23:33 UTC (rev 5760)
@@ -47,17 +47,35 @@
msgstr "Il est {0} heures et quart"
msgid "It's a quarter after {0}"
-msgstr "Il est {0} heures et un quart"
+msgstr "Il est {0} heures quart"
+msgid "It's quarter past midnight"
+msgstr "Il est minuit et quart"
+
+msgid "It's quarter past noon"
+msgstr "Il est midi et quart"
+
msgid "It's quarter to {0}"
msgstr "Il est {0} heures moins quart"
msgid "It's a quarter until {0}"
msgstr "Il est {0} heures moins le quart"
+msgid "It's quarter to midnight"
+msgstr "Il est minuit moins quart"
+
+msgid "It's quarter to noon"
+msgstr "Il est midi moins quart"
+
msgid "It's half past {0}"
msgstr "Il est {0} heures et demi"
+msgid "It's half past midnight"
+msgstr "Il est minuit et demi"
+
+msgid "It's half past noon"
+msgstr "Il est midi et demi"
+
msgid "Start every x from full hour"
msgstr "Alertes"
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
===================================================================
---
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
2009-10-21 10:06:28 UTC (rev 5759)
+++
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
2009-10-21 11:23:33 UTC (rev 5760)
@@ -7,56 +7,56 @@
msgid "This plugin gives you the time."
msgstr "Deze plugin geeft de tijd weer."
-msgid "Current time is {0} hours and {1} minutes."
+msgid "It is {0} hours and {1} minutes."
msgstr "Het is nu {0} uur en {1} minuten."
msgid "It is {0} hours {1}."
-msgstr "It is {0} hours {1}."
+msgstr "Het is {0} uur {1}."
msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
-msgstr "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr "Bij de volgende biep, is het precies {0} uur {1} ... BIEP !"
msgid "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
-msgstr "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
+msgstr "Bij de volgende biep, is het {0} uur en {1} minuten ... BIEP !"
msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1}
minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1}
minutes"
+msgstr "Het is {1} uur en {0} minuten ... Oeps, ik bedoel {0} uur en {1}
minuten"
msgid "It's {1} hours {0} ... oops, I mean {0} hours {1}."
-msgstr "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+msgstr "Het is {1} uur {0} ... Oeps, ik bedoel {0} uur {1}."
msgid "It is {0} o'clock"
-msgstr "It is {0} o'clock"
+msgstr "Het is kop {0} uur"
msgid "It's exactly {0} hours"
-msgstr "Het is nu {0} uur."
+msgstr "Het is nu precies {0} uur."
msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
-msgstr "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr "Bij de volgende biep, is het kop {0} uur ... BIEP !"
msgid "At the next beep it will be {0} o'clock ... BEEP !"
-msgstr "At the next beep it will be {0} o'clock ... BEEP !"
+msgstr "Bij de volgende biep, is het {0} uur ... BIEP !"
msgid "It's midnight"
-msgstr "It's midnight"
+msgstr "Het is middernacht"
msgid "It's noon"
-msgstr "It's noon"
+msgstr "Het is middag"
msgid "It's quarter past {0}"
-msgstr "It's quarter past {0}"
+msgstr "Het is kwart na {0}"
msgid "It's a quarter after {0}"
-msgstr "It's a quarter after {0}"
+msgstr "Het is kwart over {0}"
msgid "It's quarter to {0}"
-msgstr "It's quarter to {0}"
+msgstr "Het is kwart voor {0}"
msgid "It's a quarter until {0}"
-msgstr "It's a quarter until {0}"
+msgstr "Het is kwart voor {0}"
msgid "It's half past {0}"
-msgstr "It's half past {0}"
+msgstr "Het is half {0}"
msgid "Start every x from full hour"
msgstr "Alarmen"
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
===================================================================
---
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
2009-10-21 10:06:28 UTC (rev 5759)
+++
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
2009-10-21 11:23:33 UTC (rev 5760)
@@ -49,15 +49,33 @@
msgid "It's a quarter after {0}"
msgstr ""
+msgid "It's quarter past midnight"
+msgstr ""
+
+msgid "It's quarter past noon"
+msgstr ""
+
msgid "It's quarter to {0}"
msgstr ""
msgid "It's a quarter until {0}"
msgstr ""
+msgid "It's quarter to midnight"
+msgstr ""
+
+msgid "It's quarter to noon"
+msgstr ""
+
msgid "It's half past {0}"
msgstr ""
+msgid "It's half past midnight"
+msgstr ""
+
+msgid "It's half past noon"
+msgstr ""
+
msgid "Start every x from full hour"
msgstr ""
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
---
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
2009-10-21 10:06:28 UTC (rev 5759)
+++
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
2009-10-21 11:23:33 UTC (rev 5760)
@@ -79,6 +79,7 @@
Random rand = new Random();
Boolean random = rand.nextBoolean();
+ String language = configuration().getLanguage();
if (m == 0) {
if (h == 0) {
@@ -92,29 +93,69 @@
}
}
else if (m == 15) {
- if (random) {
- throwMessage("It's quarter past {0}", h);
+ if (h == 0 && !(language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's quarter past midnight");
}
- else {
- throwMessage("It's a quarter after {0}", h);
+ else if (h == 12 && !(language.equals("nl") ||
language.equals("de")))
+ {
+ throwMessage("It's quarter past noon");
}
+ else if (h == 0 && (language.equals("nl") ||
language.equals("de")))
+ {
+ throwMessage("It's a quarter after {0}", "12");
+ }
+ else
+ {
+ if (random) {
+ throwMessage("It's quarter past {0}", h);
+ }
+ else {
+ throwMessage("It's a quarter after {0}", h);
+ }
+ }
}
else if (m == 30) {
- String language = configuration().getLanguage();
if (language.equals("nl") || language.equals("de")) {
throwMessage("It's half past {0}", h+1);
}
else {
- throwMessage("It's half past {0}", h);
+ if (h == 0)
+ {
+ throwMessage("It's half past midnight");
+ }
+ else if (h == 12)
+ {
+ throwMessage("It's half past noon");
+ }
+ else
+ {
+ throwMessage("It's half past {0}", h);
+ }
}
}
else if (m == 45) {
- if (random) {
- throwMessage("It's quarter to {0}", (h + 1));
+ if (h == 23 && !(language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's quarter to midnight");
}
- else {
- throwMessage("It's a quarter until {0}", (h + 1));
+ else if (h == 11 && !(language.equals("nl") ||
language.equals("de")))
+ {
+ throwMessage("It's quarter to noon");
}
+ else if (h == 23 && (language.equals("nl") ||
language.equals("de")))
+ {
+ throwMessage("It's quarter to {0}", "12");
+ }
+ else
+ {
+ if (random) {
+ throwMessage("It's quarter to {0}", (h + 1));
+ }
+ else {
+ throwMessage("It's a quarter until {0}", (h + 1));
+ }
+ }
}
else {
throwMessage(this.pickSentence(normalSentences), h, m);
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
