From: <gem...@li...> - 2012-12-13 17:02:28
|
Revision: 1062 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1062&view=rev Author: matijsdejong Date: 2012-12-13 17:02:21 +0000 (Thu, 13 Dec 2012) Log Message: ----------- Slightly more polite phrasing used Modified Paths: -------------- trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php trunk/library/languages/default-en.mo trunk/library/languages/default-en.po trunk/library/languages/default-nl.mo trunk/library/languages/default-nl.po Modified: trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php =================================================================== --- trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php 2012-12-13 14:55:27 UTC (rev 1061) +++ trunk/library/classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php 2012-12-13 17:02:21 UTC (rev 1062) @@ -164,23 +164,32 @@ switch ($days) { case 0: - return array(MUtil_Html::create('strong', $this->_('Warning!!!')), ' ', $this->_('Survey must be answered today!')); + return array( + MUtil_Html::create('strong', $this->_('Warning!!!')), + ' ', + $this->_('This survey must be answered today!') + ); case 1: - return array(MUtil_Html::create('strong', $this->_('Warning!!')), ' ', $this->_('Survey must be answered tomorrow!')); + return array( + MUtil_Html::create('strong', $this->_('Warning!!')), + ' ', + $this->_('This survey can only be answered until tomorrow!') + ); case 2: - return $this->_('Warning! Survey must be answered over 2 days!'); + return $this->_('Warning! This survey can only be answered for another 2 days!'); default: - if (abs($days) <= 14) { - if ($days >= 0) { - return sprintf($this->_('Survey must be answered in %d days.'), $days); - } else { - return $this->_('Survey can no longer be answered.'); - } + if ($days <= 14) { + return sprintf($this->_('Please answer this survey within %d days.'), $days); } - return sprintf($this->_('Survey can be answered until %s.'), $dateTime->toString($this->dateFormat)); + + if ($days <= 0) { + return $this->_('This survey can no longer be answered.'); + } + + return sprintf($this->_('Please answer this survey before %s.'), $dateTime->toString($this->dateFormat)); } } Modified: trunk/library/languages/default-en.mo =================================================================== (Binary files differ) Modified: trunk/library/languages/default-en.po =================================================================== --- trunk/library/languages/default-en.po 2012-12-13 14:55:27 UTC (rev 1061) +++ trunk/library/languages/default-en.po 2012-12-13 17:02:21 UTC (rev 1062) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: GemsTracker EN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-13 15:39+0100\n" +"POT-Creation-Date: 2012-12-13 17:56+0100\n" "PO-Revision-Date: \n" "Last-Translator: Matijs de Jong <mj...@ma...>\n" "Language-Team: Erasmus MGZ <mat...@ma...>\n" @@ -4203,39 +4203,39 @@ msgid "Survey has no time limit." msgstr "Survey has no time limit." -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:168 msgid "Warning!!!" msgstr "Warning!!!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167 -msgid "Survey must be answered today!" -msgstr "Survey must be answered today!" +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170 +msgid "This survey must be answered today!" +msgstr "This survey must be answered today!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:175 msgid "Warning!!" msgstr "Warning!!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170 -msgid "Survey must be answered tomorrow!" -msgstr "Survey must be answered tomorrow!" +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:177 +msgid "This survey can only be answered until tomorrow!" +msgstr "This survey can only be answered until tomorrow!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:173 -msgid "Warning! Survey must be answered over 2 days!" -msgstr "Warning! Survey must be answered over 2 days!" +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:181 +msgid "Warning! This survey can only be answered for another 2 days!" +msgstr "Warning! This survey can only be answered for another 2 days!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:178 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:185 #, php-format -msgid "Survey must be answered in %d days." -msgstr "Survey must be answered in %d days." +msgid "Please answer this survey within %d days." +msgstr "Please answer this survey within %d days." -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:180 -msgid "Survey can no longer be answered." -msgstr "Survey can no longer be answered." +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:189 +msgid "This survey can no longer be answered." +msgstr "This survey can no longer be answered." -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:183 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:192 #, php-format -msgid "Survey can be answered until %s." -msgstr "Survey can be answered until %s." +msgid "Please answer this survey before %s." +msgstr "Please answer this survey before %s." #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376 #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1173 @@ -5184,6 +5184,15 @@ msgstr[1] "" "After this survey there are another %d surveys we would like you to answer." +#~ msgid "Survey can be answered until %s." +#~ msgstr "Survey can be answered until %s." + +#~ msgid "Survey must be answered tomorrow!" +#~ msgstr "Survey must be answered tomorrow!" + +#~ msgid "Survey must be answered in %d days." +#~ msgstr "Survey must be answered in %d days." + #~ msgid "reset" #~ msgstr "reset" Modified: trunk/library/languages/default-nl.mo =================================================================== (Binary files differ) Modified: trunk/library/languages/default-nl.po =================================================================== --- trunk/library/languages/default-nl.po 2012-12-13 14:55:27 UTC (rev 1061) +++ trunk/library/languages/default-nl.po 2012-12-13 17:02:21 UTC (rev 1062) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: GemsTracker NL\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-13 15:38+0100\n" +"POT-Creation-Date: 2012-12-13 17:55+0100\n" "PO-Revision-Date: \n" "Last-Translator: Matijs de Jong <mj...@ma...>\n" "Language-Team: Erasmus MGZ <mat...@ma...>\n" @@ -4236,39 +4236,39 @@ msgid "Survey has no time limit." msgstr "Vragenlijst zonder eindtijd." -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:168 msgid "Warning!!!" msgstr "Let op!!!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:167 -msgid "Survey must be answered today!" -msgstr "Vragenlijst moet vandaag ingevuld zijn!" +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170 +msgid "This survey must be answered today!" +msgstr "Deze vragenlijst kan alleen vandaag nog ingevuld worden!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:175 msgid "Warning!!" msgstr "Let op!!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:170 -msgid "Survey must be answered tomorrow!" -msgstr "Vragenlijst moet morgen ingevuld zijn!" +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:177 +msgid "This survey can only be answered until tomorrow!" +msgstr "Deze vragenlijst kan slechts tot morgen ingevuld worden!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:173 -msgid "Warning! Survey must be answered over 2 days!" -msgstr "Let op! Vragenlijst moet overmorgen ingevuld zijn!" +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:181 +msgid "Warning! This survey can only be answered for another 2 days!" +msgstr "Let op! Deze vragenlijst kan slechts tot overmorgen ingevuld worden!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:178 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:185 #, php-format -msgid "Survey must be answered in %d days." -msgstr "Vragenlijst moet binnen %d dagen ingevuld zijn!" +msgid "Please answer this survey within %d days." +msgstr "Wij verzoeken u deze vragenlijst binnen %d dagen in te vullen." -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:180 -msgid "Survey can no longer be answered." -msgstr "Vragenlijst kan niet langer worden ingevuld!" +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:189 +msgid "This survey can no longer be answered." +msgstr "Deze vragenlijst kan niet langer worden ingevuld!" -#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:183 +#: classes/Gems/Tracker/Snippets/ShowTokenLoopAbstract.php:192 #, php-format -msgid "Survey can be answered until %s." -msgstr "Moet ingevuld worden voor %s." +msgid "Please answer this survey before %s." +msgstr "Wij verzoeken u deze vragenlijst voor %s in te vullen." #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:376 #: classes/Gems/Tracker/Source/LimeSurvey1m9Database.php:1173 @@ -5240,6 +5240,15 @@ msgstr[0] "Na deze vragenlijst hebben we nog één andere vragenlijst voor u." msgstr[1] "Na deze vragenlijst hebben we nog %d andere vragenlijsten voor u." +#~ msgid "Survey can be answered until %s." +#~ msgstr "Moet ingevuld worden voor %s." + +#~ msgid "Survey must be answered tomorrow!" +#~ msgstr "Vragenlijst moet morgen ingevuld zijn!" + +#~ msgid "Survey must be answered in %d days." +#~ msgstr "Vragenlijst moet binnen %d dagen ingevuld zijn!" + #~ msgid "reset" #~ msgstr "herstellen" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |