[Gemstracker-svn] SF.net SVN: gemstracker:[617] trunk

[<gem...@li...>]

Revision: 617
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=617&view=rev
Author:   matijsdejong
Date:     2012-04-12 13:50:23 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Merged revision(s) 616 from tags/1.5.3-rc2:
TokenPlan did not confirm to token return policy, resulted in strange behaviour
Removed familiar Dutch words (use of 'je')
........

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/TokenPlanAction.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

Property Changed:
----------------
    trunk/
    trunk/library/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614
   + /branches/1.5.0-pulse:306-430,467
/branches/1.5.x:426-455,458-472,475-481
/tags/1.5.0beta1:305
/tags/1.5.1:485,489,509-510
/tags/1.5.3-rc2:612,614,616


Property changes on: trunk/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614
   + /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534
/tags/1.5.3-rc2/library:612,614,616

Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php	2012-04-12 13:46:35 UTC (rev 616)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php	2012-04-12 13:50:23 UTC (rev 617)
@@ -344,7 +344,7 @@
         if (($this->escort instanceof Gems_Project_Organization_MultiOrganizationInterface)) {
             $availableOrganizations = $this->util->getDbLookup()->getOrganizationsWithRespondents();
             $allowedOrganizations   = $this->loader->getCurrentUser()->getAllowedOrganizations();
-            
+
             $options = array_intersect($availableOrganizations, $allowedOrganizations);
 
             $elements[] = $this->_createSelectElement('gto_id_organization', $options);
@@ -488,6 +488,9 @@
         return $this->_('Token planning');
     }
 
+    /**
+     * Default overview action
+     */
     public function indexAction()
     {
         // MUtil_Model::$verbose = true;
@@ -497,4 +500,19 @@
 
         parent::indexAction();
     }
+
+    /**
+     * Initialize translate and html objects
+     *
+     * Called from {@link __construct()} as final step of object instantiation.
+     *
+     * @return void
+     */
+    public function init()
+    {
+        parent::init();
+
+        // Tell the system where to return to after a survey has been taken
+        $this->loader->getCurrentUser()->setSurveyReturn($this->getRequest());
+    }
 }

Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po	2012-04-12 13:46:35 UTC (rev 616)
+++ trunk/library/languages/default-en.po	2012-04-12 13:50:23 UTC (rev 617)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: GemsTracker EN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-08 16:56+0100\n"
+"POT-Creation-Date: 2012-04-12 15:06+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Matijs de Jong <mj...@ma...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -484,61 +484,61 @@
 msgid "No %s found"
 msgstr "No %s found"
 
-#: classes/Gems/Controller/BrowseEditAction.php:662
+#: classes/Gems/Controller/BrowseEditAction.php:673
 #: classes/Gems/Default/ExportAction.php:234
 #, php-format
 msgid "No %s found."
 msgstr "No %s found."
 
-#: classes/Gems/Controller/BrowseEditAction.php:780
+#: classes/Gems/Controller/BrowseEditAction.php:791
 msgid "Are you sure?"
 msgstr "Are you sure?"
 
-#: classes/Gems/Controller/BrowseEditAction.php:796
+#: classes/Gems/Controller/BrowseEditAction.php:807
 #: classes/Gems/Default/DatabaseAction.php:187
 #: classes/Gems/Default/DatabaseAction.php:499
 msgid "Yes"
 msgstr "Yes"
 
-#: classes/Gems/Controller/BrowseEditAction.php:797
+#: classes/Gems/Controller/BrowseEditAction.php:808
 #: classes/Gems/Default/DatabaseAction.php:188
 #: classes/Gems/Default/DatabaseAction.php:500
 msgid "No"
 msgstr "No"
 
-#: classes/Gems/Controller/BrowseEditAction.php:850
+#: classes/Gems/Controller/BrowseEditAction.php:861
 #, php-format
 msgid "Unknown %s requested"
 msgstr "Unknown %s requested"
 
-#: classes/Gems/Controller/BrowseEditAction.php:873
+#: classes/Gems/Controller/BrowseEditAction.php:884
 #, php-format
 msgid "New %1$s..."
 msgstr "New %1$s..."
 
-#: classes/Gems/Controller/BrowseEditAction.php:881
+#: classes/Gems/Controller/BrowseEditAction.php:892
 msgid "Save"
 msgstr "Save"
 
-#: classes/Gems/Controller/BrowseEditAction.php:917
+#: classes/Gems/Controller/BrowseEditAction.php:928
 #, php-format
 msgid "%2$u %1$s saved"
 msgstr "%2$u %1$s saved"
 
-#: classes/Gems/Controller/BrowseEditAction.php:920
+#: classes/Gems/Controller/BrowseEditAction.php:931
 msgid "No changes to save."
 msgstr "No changes to save."
 
-#: classes/Gems/Controller/BrowseEditAction.php:929
+#: classes/Gems/Controller/BrowseEditAction.php:940
 msgid "Input error! No changes saved!"
 msgstr "Input error! No changes saved!"
 
-#: classes/Gems/Controller/BrowseEditAction.php:957
+#: classes/Gems/Controller/BrowseEditAction.php:968
 #, php-format
 msgid "Show %s"
 msgstr "Show %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:964
+#: classes/Gems/Controller/BrowseEditAction.php:975
 #, php-format
 msgid "Unknown %s."
 msgstr "Unknown %s."
@@ -616,22 +616,22 @@
 msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
 msgstr "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
 
-#: classes/Gems/Default/AskAction.php:132
+#: classes/Gems/Default/AskAction.php:131
 #, php-format
 msgid "Thank you for answering. At the moment we have no further surveys for you to take."
 msgstr "Thank you for answering. At the moment we have no further surveys for you to take."
 
-#: classes/Gems/Default/AskAction.php:134
+#: classes/Gems/Default/AskAction.php:133
 #, php-format
 msgid "The survey for token %s has been answered and no further surveys are open."
 msgstr "The survey for token %s has been answered and no further surveys are open."
 
-#: classes/Gems/Default/AskAction.php:141
+#: classes/Gems/Default/AskAction.php:140
 #, php-format
 msgid "The token %s does not exist (any more)."
 msgstr "The token %s does not exist (any more)."
 
-#: classes/Gems/Default/AskAction.php:243
+#: classes/Gems/Default/AskAction.php:241
 #, php-format
 msgid "The survey for token %s is no longer active."
 msgstr "The survey for token %s is no longer active."
@@ -1489,11 +1489,11 @@
 msgid "Style"
 msgstr "Style"
 
-#: classes/Gems/Default/OrganizationAction.php:123
+#: classes/Gems/Default/OrganizationAction.php:124
 msgid "Default url's"
 msgstr "Default url's"
 
-#: classes/Gems/Default/OrganizationAction.php:125
+#: classes/Gems/Default/OrganizationAction.php:126
 #, php-format
 msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
 msgstr "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
@@ -3592,9 +3592,8 @@
 msgstr "should not contain non alphanumeric characters"
 
 #: classes/Gems/User/PasswordChecker.php:188
-#, php-format
-msgid "should not contain your login name \"%s\""
-msgstr "should not contain your login name \"%s\""
+msgid "should not contain your login name"
+msgstr "should not contain your login name"
 
 #: classes/Gems/User/PasswordChecker.php:207
 #, php-format

Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)

Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po	2012-04-12 13:46:35 UTC (rev 616)
+++ trunk/library/languages/default-nl.po	2012-04-12 13:50:23 UTC (rev 617)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: GemsTracker NL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-08 16:56+0100\n"
+"POT-Creation-Date: 2012-04-12 15:06+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Matijs de Jong <mj...@ma...>\n"
 "Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -484,61 +484,61 @@
 msgid "No %s found"
 msgstr "Geen %s gevonden"
 
-#: classes/Gems/Controller/BrowseEditAction.php:662
+#: classes/Gems/Controller/BrowseEditAction.php:673
 #: classes/Gems/Default/ExportAction.php:234
 #, php-format
 msgid "No %s found."
 msgstr "Geen %s gevonden."
 
-#: classes/Gems/Controller/BrowseEditAction.php:780
+#: classes/Gems/Controller/BrowseEditAction.php:791
 msgid "Are you sure?"
 msgstr "Weet u het zeker?"
 
-#: classes/Gems/Controller/BrowseEditAction.php:796
+#: classes/Gems/Controller/BrowseEditAction.php:807
 #: classes/Gems/Default/DatabaseAction.php:187
 #: classes/Gems/Default/DatabaseAction.php:499
 msgid "Yes"
 msgstr "Ja"
 
-#: classes/Gems/Controller/BrowseEditAction.php:797
+#: classes/Gems/Controller/BrowseEditAction.php:808
 #: classes/Gems/Default/DatabaseAction.php:188
 #: classes/Gems/Default/DatabaseAction.php:500
 msgid "No"
 msgstr "Nee"
 
-#: classes/Gems/Controller/BrowseEditAction.php:850
+#: classes/Gems/Controller/BrowseEditAction.php:861
 #, php-format
 msgid "Unknown %s requested"
 msgstr "Onjuist %s verzoek"
 
-#: classes/Gems/Controller/BrowseEditAction.php:873
+#: classes/Gems/Controller/BrowseEditAction.php:884
 #, php-format
 msgid "New %1$s..."
 msgstr "Nieuwe %1$s..."
 
-#: classes/Gems/Controller/BrowseEditAction.php:881
+#: classes/Gems/Controller/BrowseEditAction.php:892
 msgid "Save"
 msgstr "Opslaan"
 
-#: classes/Gems/Controller/BrowseEditAction.php:917
+#: classes/Gems/Controller/BrowseEditAction.php:928
 #, php-format
 msgid "%2$u %1$s saved"
 msgstr "%2$u %1$s opgeslagen"
 
-#: classes/Gems/Controller/BrowseEditAction.php:920
+#: classes/Gems/Controller/BrowseEditAction.php:931
 msgid "No changes to save."
 msgstr "Geen verandering om op te slaan."
 
-#: classes/Gems/Controller/BrowseEditAction.php:929
+#: classes/Gems/Controller/BrowseEditAction.php:940
 msgid "Input error! No changes saved!"
 msgstr "Invoer fout! Veranderingen niet opgeslagen!"
 
-#: classes/Gems/Controller/BrowseEditAction.php:957
+#: classes/Gems/Controller/BrowseEditAction.php:968
 #, php-format
 msgid "Show %s"
 msgstr "Toon %s"
 
-#: classes/Gems/Controller/BrowseEditAction.php:964
+#: classes/Gems/Controller/BrowseEditAction.php:975
 #, php-format
 msgid "Unknown %s."
 msgstr "%s is onbekend."
@@ -551,7 +551,7 @@
 #: classes/Gems/Controller/ModelSnippetActionAbstract.php:236
 #, php-format
 msgid "Do you want to delete this %s?"
-msgstr "Weet je zeker dat deze %s verwijderd moet worden?"
+msgstr "Weet u zeker dat deze %s verwijderd moet worden?"
 
 #: classes/Gems/Controller/ModelSnippetActionAbstract.php:256
 #, php-format
@@ -616,22 +616,22 @@
 msgid "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
 msgstr "Er wordt geen verschil gemaakt tussen het getal nul en de letter O en ook niet tussen het getal één en de letter L."
 
-#: classes/Gems/Default/AskAction.php:132
+#: classes/Gems/Default/AskAction.php:131
 #, php-format
 msgid "Thank you for answering. At the moment we have no further surveys for you to take."
 msgstr "Dank u voor uw antwoorden. Op dit moment hebben we geen vragenlijsten meer voor u."
 
-#: classes/Gems/Default/AskAction.php:134
+#: classes/Gems/Default/AskAction.php:133
 #, php-format
 msgid "The survey for token %s has been answered and no further surveys are open."
 msgstr "De vragenlijst met het kenmerk %s is beantwoord en er staan verder geen vragenlijsten open."
 
-#: classes/Gems/Default/AskAction.php:141
+#: classes/Gems/Default/AskAction.php:140
 #, php-format
 msgid "The token %s does not exist (any more)."
 msgstr "Het kenmerk %s bestaat niet (meer)."
 
-#: classes/Gems/Default/AskAction.php:243
+#: classes/Gems/Default/AskAction.php:241
 #, php-format
 msgid "The survey for token %s is no longer active."
 msgstr "De vragenlijst voor kenmerk %s is niet meer in gebruik."
@@ -931,8 +931,8 @@
 #: classes/Gems/Default/DatabaseAction.php:489
 msgid "Are you sure you want to create it?"
 msgid_plural "Are you sure you want to create them all?"
-msgstr[0] "Weet je zeker dat je dat object wil aanmaken?"
-msgstr[1] "Weet je zeker dat je ze allemaal wil aanmaken?"
+msgstr[0] "Weet u zeker dat u dit wil aanmaken?"
+msgstr[1] "Weet u zeker dat u deze allemaal wil aanmaken?"
 
 #: classes/Gems/Default/DatabaseAction.php:502
 msgid "All database objects exist. There is nothing to create."
@@ -1489,11 +1489,11 @@
 msgid "Style"
 msgstr "Stijl"
 
-#: classes/Gems/Default/OrganizationAction.php:123
+#: classes/Gems/Default/OrganizationAction.php:124
 msgid "Default url's"
 msgstr "Standaard url's"
 
-#: classes/Gems/Default/OrganizationAction.php:125
+#: classes/Gems/Default/OrganizationAction.php:126
 #, php-format
 msgid "Always switch to this organization when %s is accessed from one of these space separated url's. The first is used for mails."
 msgstr "Altijd naar deze organisatie overschakelen als %s vanaf één van deze door spatie gescheiden url's wordt aangeroepen. De eerste url wordt gebruikt voor emails."
@@ -2414,7 +2414,7 @@
 
 #: classes/Gems/Default/TrackAction.php:410
 msgid "Do you want to delete this track?"
-msgstr "Weet je zeker dat dit traject verwijderd moet worden?"
+msgstr "Weet u zeker dat dit traject verwijderd moet worden?"
 
 #: classes/Gems/Default/TrackAction.php:412
 msgid "Delete track"
@@ -3592,9 +3592,8 @@
 msgstr "mag alleen letters en cijfers bevatten"
 
 #: classes/Gems/User/PasswordChecker.php:188
-#, php-format
-msgid "should not contain your login name \"%s\""
-msgstr "mag niet je gebruikersnaam \"%s\" bevatten"
+msgid "should not contain your login name"
+msgstr "mag niet uw gebruikersnaam bevatten"
 
 #: classes/Gems/User/PasswordChecker.php:207
 #, php-format
@@ -3888,7 +3887,7 @@
 
 #: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:108
 msgid "Do you really want to delete this item?"
-msgstr "Weet je zeker dat dit item verwijderd moet worden?"
+msgstr "Weet u zeker dat dit item verwijderd moet worden?"
 
 #: languages/FakeTranslations.php:40
 msgid "Value is required and can't be empty"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.