From: <gem...@li...> - 2012-10-17 11:03:20
|
Revision: 988 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=988&view=rev Author: matijsdejong Date: 2012-10-17 11:03:07 +0000 (Wed, 17 Oct 2012) Log Message: ----------- Created useful restoreHeaderPositions() function for survey answer filters Made LimeSurvey field map more abstract by defining the header classes in SurveyModel Modified Paths: -------------- trunk/library/classes/Gems/Event/Survey/Display/ByValue.php trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php trunk/library/classes/Gems/Event/Survey/Display/Reverse.php trunk/library/classes/Gems/Event/SurveyAnswerFilterAbstract.php trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php trunk/library/classes/Gems/Tracker/SurveyModel.php trunk/library/classes/MUtil/Model/ModelAbstract.php trunk/library/classes/MUtil/Model.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 Added Paths: ----------- trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php Modified: trunk/library/classes/Gems/Event/Survey/Display/ByValue.php =================================================================== --- trunk/library/classes/Gems/Event/Survey/Display/ByValue.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/Gems/Event/Survey/Display/ByValue.php 2012-10-17 11:03:07 UTC (rev 988) @@ -47,13 +47,6 @@ class Gems_Event_Survey_Display_ByValue extends Gems_Event_SurveyAnswerFilterAbstract { /** - * Contains the values of the current token - * - * @var array - */ - private $_values; - - /** * This function is called in addBrowseTableColumns() to filter the names displayed * by AnswerModelSnippetGeneric. * @@ -68,50 +61,23 @@ { $currentNames = array_combine($currentNames, $currentNames); $newOrder = array(); + $values = array_filter($this->token->getRawAnswers(), 'is_numeric'); + arsort($values); - foreach ($this->_values as $key => $value) { - if (isset($currentNames[$key])) { - if ($parent = $model->get($key, 'parent_question')) { - $count = 0; - foreach ($model->getCol('parent_question') as $name => $currentParent) { - if (isset($currentNames[$name]) && ($currentParent === $parent)) { - $count++; - } - } - // Last occurence of this parent question - if ($count < 2) { - unset($currentNames[$parent]); - } - $newOrder[] = $parent; - // MUtil_Echo::track($key, $parent); - } - + foreach ($values as $key => $value) { + if (isset($currentNames[$key])) { unset($currentNames[$key]); $newOrder[] = $key; } } - // MUtil_Echo::track($this->_values, $newOrder + $currentNames); + // MUtil_Echo::track($this->_values, $newOrder, $newOrder + $currentNames); - return $newOrder + $currentNames; + return $this->restoreHeaderPositions($model, $newOrder + $currentNames); } /** - * Function that returns the snippets to use for this display. - * - * @param Gems_Tracker_Token $token The token to get the snippets for - * @return array of Snippet names or nothing - */ - public function getAnswerDisplaySnippets(Gems_Tracker_Token $token) - { - $this->_values = array_filter($token->getRawAnswers(), 'is_numeric'); - arsort($this->_values); - - return parent::getAnswerDisplaySnippets($token); - } - - /** * A pretty name for use in dropdown selection boxes. * * @return string Name Modified: trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php =================================================================== --- trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/Gems/Event/Survey/Display/OnlyAnswered.php 2012-10-17 11:03:07 UTC (rev 988) @@ -74,37 +74,10 @@ $keys += array_filter($row->getArrayCopy()); } - $lastMain = null; - $names = array(); - foreach ($currentNames as $name) { - $exists = isset($keys[$name]); + $results = array_intersect($currentNames, array_keys($keys)); + // MUtil_Echo::track($results); - // Keep track of should a main question be displayed. - // The question or a sub question should be answered - if ($model->get($name, 'thClass') === 'question') { - if ($lastMain) { - unset($names[$lastMain]); - } - - if ($exists) { - $lastMain = null; // Has value, display - } else { - $exists = true; // Add to list for the moment - $lastMain = $name; // But keep track for possible removal - } - } elseif ($exists) { - $lastMain = null; // Must display last main question - } - - - if ($exists) { - $names[$name] = $name; - // MUtil_Echo::track($name, $model->get($name, 'thClass'), $model->get($name, 'label')); - } - } - // MUtil_Echo::track($names); - - return $names; + return $this->restoreHeaderPositions($model, $results); } /** Modified: trunk/library/classes/Gems/Event/Survey/Display/Reverse.php =================================================================== --- trunk/library/classes/Gems/Event/Survey/Display/Reverse.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/Gems/Event/Survey/Display/Reverse.php 2012-10-17 11:03:07 UTC (rev 988) @@ -59,7 +59,7 @@ */ public function filterAnswers(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model, array $currentNames) { - return array_reverse($currentNames); + return $this->restoreHeaderPositions($model, array_reverse($currentNames)); } /** Added: trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php =================================================================== --- trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php (rev 0) +++ trunk/library/classes/Gems/Event/Survey/Display/YesOnTop.php 2012-10-17 11:03:07 UTC (rev 988) @@ -0,0 +1,103 @@ +<?php + +/** + * Copyright (c) 2012, Erasmus MC + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Erasmus MC nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + * @package Gems + * @subpackage Events + * @author Matijs de Jong <mj...@ma...> + * @copyright Copyright (c) 2012 Erasmus MC + * @license New BSD License + * @version $id: OnlyAnswered.php 203 2012-01-01t 12:51:32Z matijs $ + */ + +/** + * Display those questions that are answered with 'yes' op top + * + * Questions names that are the same as the yes question but with a longer name + * separated by an '_' are moved with the question, as are header questions + * (which may be doubled when not all question come out on top). + * + * @package Gems + * @subpackage Events + * @copyright Copyright (c) 2012 Erasmus MC + * @license New BSD License + * @since Class available since version 1.5.6 + */ +class Gems_Event_Survey_Display_YesOnTop extends Gems_Event_SurveyAnswerFilterAbstract +{ + /** + * This function is called in addBrowseTableColumns() to filter the names displayed + * by AnswerModelSnippetGeneric. + * + * @see Gems_Tracker_Snippets_AnswerModelSnippetGeneric + * + * @param MUtil_Model_TableBridge $bridge + * @param MUtil_Model_ModelAbstract $model + * @param array $currentNames The current names in use (allows chaining) + * @return array Of the names of labels that should be shown + */ + public function filterAnswers(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model, array $currentNames) + { + if (! $this->token->isCompleted()) { + return $currentNames; + } + + $answers = $this->token->getRawAnswers(); + $onTop = array(); + + // MUtil_Echo::track($answers); + + foreach($answers as $name => $value) { + if ($value === 'Y') { + $onTop[$name] = $name; + } else { + $nameParts = explode('_', $name); + + if (count($nameParts) > 1) { + if (isset($onTop[$nameParts[0]])) { + $onTop[$name] = $name; + } + } + } + } + + // MUtil_Echo::track($onTop, $onTop + $currentNames, $currentNames); + + return $this->restoreHeaderPositions($model, $onTop + $currentNames); + } + + /** + * A pretty name for use in dropdown selection boxes. + * + * @return string Name + */ + public function getEventName() + { + return $this->translate->_('Yes answers on top.'); + } +} Modified: trunk/library/classes/Gems/Event/SurveyAnswerFilterAbstract.php =================================================================== --- trunk/library/classes/Gems/Event/SurveyAnswerFilterAbstract.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/Gems/Event/SurveyAnswerFilterAbstract.php 2012-10-17 11:03:07 UTC (rev 988) @@ -49,6 +49,18 @@ { /** * + * @var Zend_Locale + */ + protected $locale; + + /** + * + * @var Gems_Tracker_Token + */ + protected $token; + + /** + * * @var Zend_Translate */ protected $translate; @@ -63,6 +75,8 @@ */ public function getAnswerDisplaySnippets(Gems_Tracker_Token $token) { + $this->token = $token; + $snippets = (array) $token->getTrackEngine()->getAnswerSnippetNames(); $snippets['answerFilter'] = $this; @@ -71,4 +85,53 @@ } // public function getEventName() + + /** + * Restores the header position of question before their corresponding question_sub + * + * When sub-questions with the same parent are shown continuous the parent is shown + * once before them. When the sub-questions are displayed in seperate groups the + * parent is shown once at their start. + * + * Stand alone headers without any corresponding value are removed. When they do have + * a value of their own they are still shown, but their position may change according + * to their sub-questions position. (NOTE: As in LimeSurvey their are no question + * headers with values we leave it at this for the moment.) + * + * @param MUtil_Model_ModelAbstract $model + * @param array $currentNames The current names in use (allows chaining) + * @return array Of the names of labels that should be shown + */ + protected function restoreHeaderPositions(MUtil_Model_ModelAbstract $model, array $currentNames) + { + $lastParent = null; + $results = array(); + foreach ($currentNames as $name) { + if ($model->is($name, 'type', MUtil_Model::TYPE_NOVALUE)) { + // Skip header types that contain no value + continue; + } + + if ($parent = $model->get($name, 'parent_question')) { + // Check for change of parent + if ($lastParent !== $parent) { + if (isset($results[$parent])) { + // Add another copy of the parent to the array + $results[] = $parent; + } else { + // Insert parent header on name if it was not shown before + $results[$parent] = $parent; + } + $lastParent = $parent; + } + } + + // If already set (as a $parent) this will not + // redisplay the $parent as $result[$name] does + // not change position + $results[$name] = $name; + } + + return $results; + } } Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php =================================================================== --- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php 2012-10-17 11:03:07 UTC (rev 988) @@ -604,7 +604,7 @@ foreach ($map as $name => $field) { $tmpres = array(); - $tmpres['thClass'] = 'question'; + $tmpres['thClass'] = Gems_Tracker_SurveyModel::CLASS_MAIN_QUESTION; $tmpres['group'] = $field['gid']; $tmpres['type'] = $this->_getType($field); @@ -625,13 +625,14 @@ // Add non answered question for grouping and make it the current parent $parent = '_' . $name . '_'; $model->set($parent, $tmpres); + $model->set($parent, 'type', MUtil_Model::TYPE_NOVALUE); } if (isset($field['sq_question1'])) { $tmpres['label'] = MUtil_Html::raw(sprintf($this->translate->_('%s: %s'), $this->removeHtml($field['sq_question']), $this->removeHtml($field['sq_question1']))); } else { $tmpres['label'] = MUtil_Html::raw($this->removeHtml($field['sq_question'])); } - $tmpres['thClass'] = 'question_sub'; + $tmpres['thClass'] = Gems_Tracker_SurveyModel::CLASS_SUB_QUESTION; } if ($options = $this->_getMultiOptions($field)) { $tmpres['multiOptions'] = $options; @@ -643,7 +644,7 @@ } // Parent storage - if ('question' === $tmpres['thClass']) { + if (Gems_Tracker_SurveyModel::CLASS_MAIN_QUESTION === $tmpres['thClass']) { $parent = $name; } elseif ($parent) { // Add the name of the parent item @@ -675,7 +676,7 @@ foreach ($map as $name => $field) { $tmpres = array(); - $tmpres['class'] = 'question'; + $tmpres['class'] = Gems_Tracker_SurveyModel::CLASS_MAIN_QUESTION; $tmpres['group'] = $field['gid']; $tmpres['type'] = $field['type']; $tmpres['title'] = $field['title']; @@ -700,7 +701,7 @@ // "Next" question $tmpres['question'] = $this->removeMarkup($field['sq_question']); } - $tmpres['class'] = 'question_sub'; + $tmpres['class'] = Gems_Tracker_SurveyModel::CLASS_SUB_QUESTION; } $tmpres['answers'] = $this->_getPossibleAnswers($field); Modified: trunk/library/classes/Gems/Tracker/SurveyModel.php =================================================================== --- trunk/library/classes/Gems/Tracker/SurveyModel.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/Gems/Tracker/SurveyModel.php 2012-10-17 11:03:07 UTC (rev 988) @@ -47,6 +47,16 @@ class Gems_Tracker_SurveyModel extends Gems_Model_JoinModel { /** + * Constant containing css classname for main questions + */ + const CLASS_MAIN_QUESTION = 'question'; + + /** + * Constant containing css classname for subquestions + */ + const CLASS_SUB_QUESTION = 'question_sub'; + + /** * * @var Gems_Tracker_Source_SourceInterface */ Modified: trunk/library/classes/MUtil/Model/ModelAbstract.php =================================================================== --- trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/MUtil/Model/ModelAbstract.php 2012-10-17 11:03:07 UTC (rev 988) @@ -545,7 +545,7 @@ * Use <code>$this->set('fieldname', 'order', <value>);</code> to set a custom ordering. * * @see set() - * @return array + * @return array int => name */ public function getItemsOrdered() { Modified: trunk/library/classes/MUtil/Model.php =================================================================== --- trunk/library/classes/MUtil/Model.php 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/classes/MUtil/Model.php 2012-10-17 11:03:07 UTC (rev 988) @@ -78,6 +78,7 @@ */ const TEXT_FILTER = 'search'; + const TYPE_NOVALUE = 0; const TYPE_STRING = 1; const TYPE_NUMERIC = 2; const TYPE_DATE = 3; Modified: trunk/library/languages/default-en.mo =================================================================== (Binary files differ) Modified: trunk/library/languages/default-en.po =================================================================== --- trunk/library/languages/default-en.po 2012-10-16 13:41:46 UTC (rev 987) +++ trunk/library/languages/default-en.po 2012-10-17 11:03:07 UTC (rev 988) @@ -2,14 +2,14 @@ msgstr "" "Project-Id-Version: GemsTracker EN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-11 18:28+0100\n" +"POT-Creation-Date: 2012-10-17 12:56+0100\n" "PO-Revision-Date: \n" "Last-Translator: Matijs de Jong <mj...@ma...>\n" "Language-Team: Erasmus MGZ <mat...@ma...>\n" -"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-SourceCharset: iso-8859-1\n" "X-Poedit-Basepath: ../\n" @@ -31,7 +31,8 @@ msgid "You are logged in as %s" msgstr "You are logged in as %s" -#: classes/GemsEscort.php:803 classes/Gems/Menu.php:263 +#: classes/GemsEscort.php:803 +#: classes/Gems/Menu.php:263 msgid "Logoff" msgstr "Logoff" @@ -49,18 +50,15 @@ msgstr "version" #: classes/GemsEscort.php:1465 -msgid "" -"Take note: your session has expired, your inputs were not saved. Please " -"check the input data and try again" -msgstr "" -"Take note: your session has expired, your inputs were not saved. Please " -"check the input data and try again" +msgid "Take note: your session has expired, your inputs were not saved. Please check the input data and try again" +msgstr "Take note: your session has expired, your inputs were not saved. Please check the input data and try again" #: classes/GemsEscort.php:1594 msgid "Please check back later." msgstr "Please check back later." -#: classes/GemsEscort.php:1596 classes/GemsEscort.php:1600 +#: classes/GemsEscort.php:1596 +#: classes/GemsEscort.php:1600 #: classes/GemsEscort.php:1601 msgid "System is in maintenance mode" msgstr "System is in maintenance mode" @@ -69,22 +67,22 @@ msgid "No access to site." msgstr "No access to site." -#: classes/GemsEscort.php:1613 classes/GemsEscort.php:1656 +#: classes/GemsEscort.php:1613 +#: classes/GemsEscort.php:1656 msgid "You have no access to this site." msgstr "You have no access to this site." -#: classes/GemsEscort.php:1629 classes/Gems/Default/StaffAction.php:317 +#: classes/GemsEscort.php:1629 msgid "No access to page" msgstr "No access to page" -#: classes/GemsEscort.php:1631 classes/Gems/Default/OrganizationAction.php:102 -#: classes/Gems/Default/StaffAction.php:318 -#: classes/Gems/Model/HiddenOrganizationModel.php:115 +#: classes/GemsEscort.php:1631 #, php-format msgid "Access to this page is not allowed for current role: %s." msgstr "Access to this page is not allowed for current role: %s." -#: classes/GemsEscort.php:1641 classes/GemsEscort.php:1654 +#: classes/GemsEscort.php:1641 +#: classes/GemsEscort.php:1654 msgid "You are no longer logged in." msgstr "You are no longer logged in." @@ -92,7 +90,8 @@ msgid "You must login to access this page." msgstr "You must login to access this page." -#: classes/GemsEscort.php:1783 classes/GemsEscort.php:1785 +#: classes/GemsEscort.php:1783 +#: classes/GemsEscort.php:1785 #, php-format msgid "%d survey" msgid_plural "%d surveys" @@ -148,7 +147,7 @@ msgid "Project setup" msgstr "Project setup" -#: classes/Gems/Menu.php:170 classes/Gems/Default/SourceAction.php:203 +#: classes/Gems/Menu.php:170 msgid "Database" msgstr "Database" @@ -156,11 +155,11 @@ msgid "Content" msgstr "Content" -#: classes/Gems/Menu.php:177 classes/Gems/Default/DatabaseAction.php:313 +#: classes/Gems/Menu.php:177 msgid "Execute" msgstr "Execute" -#: classes/Gems/Menu.php:182 classes/Gems/Default/DatabaseAction.php:289 +#: classes/Gems/Menu.php:182 msgid "Patches" msgstr "Patches" @@ -176,7 +175,7 @@ msgid "Run SQL" msgstr "Run SQL" -#: classes/Gems/Menu.php:190 classes/Gems/Default/ReceptionAction.php:131 +#: classes/Gems/Menu.php:190 msgid "Reception codes" msgstr "Reception codes" @@ -184,16 +183,16 @@ msgid "Consents" msgstr "Consents" -#: classes/Gems/Menu.php:196 classes/Gems/Default/RoleAction.php:309 +#: classes/Gems/Menu.php:196 msgid "Roles" msgstr "Roles" -#: classes/Gems/Menu.php:197 classes/Gems/Menu.php:391 +#: classes/Gems/Menu.php:197 +#: classes/Gems/Menu.php:391 msgid "Assigned" msgstr "Assigned" -#: classes/Gems/Menu.php:198 classes/Gems/Default/RoleAction.php:238 -#: classes/Gems/Default/RoleAction.php:324 +#: classes/Gems/Menu.php:198 msgid "Privileges" msgstr "Privileges" @@ -202,20 +201,14 @@ msgstr "Groups" #: classes/Gems/Menu.php:204 -#: classes/Gems/Default/SurveyMaintenanceAction.php:204 -#: classes/Gems/Default/TrackMaintenanceAction.php:131 -#: classes/Gems/Email/MailTemplateForm.php:101 -#: classes/Gems/Tracker/Snippets/EditTrackEngineSnippetGeneric.php:140 msgid "Organizations" msgstr "Organizations" -#: classes/Gems/Menu.php:207 classes/Gems/Default/GroupAction.php:121 -#: classes/Gems/Default/LogAction.php:193 -#: classes/Gems/Default/StaffAction.php:470 +#: classes/Gems/Menu.php:207 msgid "Staff" msgstr "Staff" -#: classes/Gems/Menu.php:210 classes/Gems/Default/LogAction.php:213 +#: classes/Gems/Menu.php:210 msgid "Logging" msgstr "Logging" @@ -227,15 +220,14 @@ msgid "Upgrade" msgstr "Upgrade" -#: classes/Gems/Menu.php:220 classes/Gems/Menu.php:221 -#: classes/Gems/Default/ProjectInformationAction.php:113 -#: classes/Gems/Default/ProjectInformationAction.php:118 +#: classes/Gems/Menu.php:220 +#: classes/Gems/Menu.php:221 #, php-format msgid "Changelog %s" msgstr "Changelog %s" -#: classes/Gems/Menu.php:222 classes/Gems/Menu.php:355 -#: classes/Gems/Menu/SubMenuItem.php:551 +#: classes/Gems/Menu.php:222 +#: classes/Gems/Menu.php:355 msgid "Show" msgstr "Show" @@ -264,7 +256,7 @@ msgid "Logon" msgstr "Logon" -#: classes/Gems/Menu.php:258 classes/Gems/User/Form/LoginForm.php:112 +#: classes/Gems/Menu.php:258 msgid "Lost password" msgstr "Lost password" @@ -272,72 +264,40 @@ msgid "Your account" msgstr "Your account" -#: classes/Gems/Menu.php:260 classes/Gems/Default/OptionAction.php:153 +#: classes/Gems/Menu.php:260 msgid "Activity overview" msgstr "Activity overview" -#: classes/Gems/Menu.php:261 classes/Gems/Default/OptionAction.php:78 +#: classes/Gems/Menu.php:261 msgid "Change password" msgstr "Change password" -#: classes/Gems/Menu.php:262 classes/Gems/Menu.php:315 -#: classes/Gems/Menu.php:361 classes/Gems/Default/MailLogAction.php:114 -#: classes/Gems/Default/TrackAction.php:459 -#: classes/Gems/Export/RespondentExport.php:147 -#: classes/Gems/Snippets/TokenModelSnippetAbstract.php:70 -#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:482 -#: classes/Gems/Tracker/Form/AskTokenForm.php:77 -#: classes/Gems/Tracker/Model/StandardTokenModel.php:195 -#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:188 -#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:197 -#: snippets/BrowseSingleSurveyTokenSnippet.php:164 -#: snippets/TrackTokenOverviewSnippet.php:132 -#: snippets/Organization/OrganizationEditSnippet.php:89 -#: snippets/Track/Token/ShowAllOpenSnippet.php:88 -#: snippets/Track/Token/ShowFirstOpenSnippet.php:110 +#: classes/Gems/Menu.php:262 +#: classes/Gems/Menu.php:315 +#: classes/Gems/Menu.php:361 msgid "Token" msgstr "Token" -#: classes/Gems/Menu.php:303 classes/Gems/Export/RespondentExport.php:318 +#: classes/Gems/Menu.php:303 msgid "Export" msgstr "Export" -#: classes/Gems/Menu.php:310 classes/Gems/Default/MailJobAction.php:99 -#: classes/Gems/Default/ProjectTracksAction.php:64 -#: classes/Gems/Default/TrackAction.php:328 -#: classes/Gems/Default/TrackActionAbstract.php:219 -#: classes/Gems/Default/TrackFieldsAction.php:96 -#: classes/Gems/Email/OneMailForm.php:54 -#: classes/Gems/Export/RespondentExport.php:224 -#: classes/Gems/Export/RespondentExport.php:236 -#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:484 -#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:752 -#: classes/Gems/Tracker/Model/StandardTokenModel.php:216 -#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:149 -#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:146 -#: snippets/Track/Token/ShowAllOpenSnippet.php:148 +#: classes/Gems/Menu.php:310 msgid "Track" msgstr "Track" -#: classes/Gems/Menu.php:318 classes/Gems/Menu.php:343 +#: classes/Gems/Menu.php:318 +#: classes/Gems/Menu.php:343 #: classes/Gems/Menu.php:385 -#: classes/Gems/Default/TrackMaintenanceAction.php:367 -#: snippets/AddTracksSnippet.php:242 msgid "Add" msgstr "Add" -#: classes/Gems/Menu.php:324 classes/Gems/Menu.php:424 -#: classes/Gems/Email/EmailFormAbstract.php:280 -#: classes/Gems/Email/EmailFormAbstract.php:291 -#: classes/Gems/Menu/MenuAbstract.php:367 -#: classes/Gems/Menu/MenuAbstract.php:380 +#: classes/Gems/Menu.php:324 +#: classes/Gems/Menu.php:424 msgid "Preview" msgstr "Preview" -#: classes/Gems/Menu.php:333 classes/Gems/Default/ExportAction.php:149 -#: classes/Gems/Default/TrackMaintenanceAction.php:314 -#: classes/Gems/Menu/MenuAbstract.php:376 -#: classes/Gems/Menu/MenuAbstract.php:458 snippets/AddTracksSnippet.php:239 +#: classes/Gems/Menu.php:333 msgid "Tracks" msgstr "Tracks" @@ -345,19 +305,15 @@ msgid "Assignments" msgstr "Assignments" -#: classes/Gems/Menu.php:365 classes/Gems/Menu/SubMenuItem.php:417 +#: classes/Gems/Menu.php:365 msgid "Edit" msgstr "Edit" -#: classes/Gems/Menu.php:371 classes/Gems/Menu/SubMenuItem.php:398 +#: classes/Gems/Menu.php:371 msgid "Delete" msgstr "Delete" #: classes/Gems/Menu.php:378 -#: classes/Gems/Default/SurveyMaintenanceAction.php:564 -#: classes/Gems/Menu/MenuAbstract.php:383 -#: classes/Gems/Menu/MenuAbstract.php:445 -#: classes/Gems/Tracker/Model/TrackModel.php:100 msgid "Surveys" msgstr "Surveys" @@ -374,13 +330,10 @@ msgstr "E-Mail now!" #: classes/Gems/Menu.php:427 -#: classes/Gems/Tracker/Engine/StepEngineAbstract.php:481 msgid "Answers" msgstr "Answers" -#: classes/Gems/Menu.php:579 classes/Gems/Default/GroupAction.php:122 -#: classes/Gems/Default/OrganizationAction.php:150 -#: classes/Gems/Default/RespondentAction.php:425 +#: classes/Gems/Menu.php:579 msgid "Respondents" msgstr "Patients" @@ -388,7 +341,7 @@ msgid "Overview" msgstr "Overview" -#: classes/Gems/Menu.php:594 classes/Gems/Menu/MenuAbstract.php:340 +#: classes/Gems/Menu.php:594 msgid "Project" msgstr "Project" @@ -404,13 +357,11 @@ msgid "Mail" msgstr "Mail" -#: classes/Gems/Menu.php:609 classes/Gems/Default/RespondentAction.php:533 -#: classes/Gems/Default/RespondentExportAction.php:60 +#: classes/Gems/Menu.php:609 msgid "Export respondent" msgstr "Export respondent" -#: classes/Gems/Menu.php:615 classes/Gems/Default/ContactAction.php:101 -#: snippets/Organization/OrganizationEditSnippet.php:82 +#: classes/Gems/Menu.php:615 msgid "Contact" msgstr "Contact" @@ -419,19 +370,10 @@ msgstr "Changelog" #: classes/Gems/Model.php:206 -#: classes/Gems/Tracker/Model/StandardTokenModel.php:213 msgid "Respondent nr" msgstr "Patient nr" -#: classes/Gems/Model.php:209 classes/Gems/Default/ExportAction.php:172 -#: classes/Gems/Default/IndexAction.php:229 -#: classes/Gems/Default/LogAction.php:197 -#: classes/Gems/Default/MailJobAction.php:98 -#: classes/Gems/Default/StaffAction.php:340 -#: classes/Gems/Snippets/Export/ReportHeaderSnippet.php:63 -#: classes/Gems/User/Form/LayeredLoginForm.php:254 -#: classes/Gems/User/Form/OrganizationFormAbstract.php:166 -#: snippets/Organization/OrganizationEditSnippet.php:80 +#: classes/Gems/Model.php:209 msgid "Organization" msgstr "Organization" @@ -443,44 +385,27 @@ msgid "Consent" msgstr "Consent" -#: classes/Gems/Model.php:214 classes/Gems/Default/OptionAction.php:130 -#: classes/Gems/Default/StaffAction.php:330 +#: classes/Gems/Model.php:214 msgid "E-Mail" msgstr "E-Mail" -#: classes/Gems/Model.php:219 classes/Gems/Default/OptionAction.php:134 -#: classes/Gems/Default/StaffAction.php:343 +#: classes/Gems/Model.php:219 msgid "Gender" msgstr "Gender" -#: classes/Gems/Model.php:220 classes/Gems/Default/OptionAction.php:131 -#: classes/Gems/Default/StaffAction.php:185 +#: classes/Gems/Model.php:220 msgid "First name" msgstr "First name" -#: classes/Gems/Model.php:221 classes/Gems/Default/OptionAction.php:132 -#: classes/Gems/Default/StaffAction.php:187 +#: classes/Gems/Model.php:221 msgid "Surname prefix" msgstr "Surname prefix" -#: classes/Gems/Model.php:222 classes/Gems/Default/OptionAction.php:133 -#: classes/Gems/Default/StaffAction.php:188 +#: classes/Gems/Model.php:222 msgid "Last name" msgstr "Last name" -#: classes/Gems/Model.php:224 classes/Gems/Default/DatabaseAction.php:135 -#: classes/Gems/Default/DatabaseAction.php:335 -#: classes/Gems/Default/GroupAction.php:115 -#: classes/Gems/Default/OrganizationAction.php:122 -#: classes/Gems/Default/RoleAction.php:231 -#: classes/Gems/Default/SourceAction.php:195 -#: classes/Gems/Default/StaffAction.php:328 -#: classes/Gems/Default/SurveyMaintenanceAction.php:413 -#: classes/Gems/Default/TokenPlanAction.php:121 -#: classes/Gems/Default/TrackFieldsAction.php:98 -#: classes/Gems/Default/TrackMaintenanceAction.php:227 -#: classes/Gems/Snippets/TokenPlanTableSnippet.php:60 -#: classes/Gems/Tracker/Model/TrackModel.php:98 +#: classes/Gems/Model.php:224 msgid "Name" msgstr "Name" @@ -493,7 +418,6 @@ msgstr "Zipcode" #: classes/Gems/Model.php:229 -#: classes/Gems/Default/RespondentPlanAction.php:134 msgid "City" msgstr "City" @@ -502,7 +426,6 @@ msgstr "Phone" #: classes/Gems/Model.php:233 -#: classes/Gems/Default/RespondentPlanAction.php:133 msgid "Birthday" msgstr "Birthday" @@ -549,110 +472,61 @@ msgstr "Trying upgrade for %s to level %s: %s" #: classes/Gems/Controller/BrowseEditAction.php:357 -#: classes/Gems/Controller/ModelSnippetActionAbstract.php:239 -#: classes/Gems/Default/StaffAction.php:228 -#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:186 #, php-format msgid "New %s..." msgstr "New %s..." #: classes/Gems/Controller/BrowseEditAction.php:390 -#: classes/Gems/Controller/ModelSnippetActionAbstract.php:259 -#: classes/Gems/Default/TrackFieldsAction.php:130 -#: classes/Gems/Default/TrackRoundsAction.php:171 #, php-format msgid "Delete %s" msgstr "Delete %s" #: classes/Gems/Controller/BrowseEditAction.php:394 -#: classes/Gems/Default/TrackFieldsAction.php:137 -#: classes/Gems/Default/TrackRoundsAction.php:186 -#: snippets/DeleteSingleSurveyInSourceTokenSnippet.php:134 -#: snippets/DeleteTrackTokenSnippet.php:152 #, php-format msgid "%2$u %1$s deleted" msgstr "%2$u %1$s deleted" #: classes/Gems/Controller/BrowseEditAction.php:411 -#: classes/Gems/Default/OrganizationAction.php:208 #, php-format msgid "Edit %s %s" msgstr "Edit %s %s" #: classes/Gems/Controller/BrowseEditAction.php:413 -#: classes/Gems/Controller/ModelSnippetActionAbstract.php:269 -#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:188 #, php-format msgid "Edit %s" msgstr "Edit %s" #: classes/Gems/Controller/BrowseEditAction.php:516 -#: classes/Gems/Snippets/AutosearchFormSnippet.php:166 msgid "Free search text" msgstr "Free search text" #: classes/Gems/Controller/BrowseEditAction.php:587 -#: classes/Gems/Snippets/AutosearchFormSnippet.php:241 msgid "Search" msgstr "Search" #: classes/Gems/Controller/BrowseEditAction.php:603 -#: classes/Gems/Default/TrackMaintenanceAction.php:361 #, php-format msgid "No %s found" msgstr "No %s found" #: classes/Gems/Controller/BrowseEditAction.php:690 -#: classes/Gems/Default/ExportAction.php:245 #, php-format msgid "No %s found." msgstr "No %s found." #: classes/Gems/Controller/BrowseEditAction.php:805 -#: classes/Gems/Default/TrackRoundsAction.php:244 -#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:94 msgid "Are you sure?" msgstr "Are you sure?" #: classes/Gems/Controller/BrowseEditAction.php:821 -#: classes/Gems/Default/DatabaseAction.php:187 -#: classes/Gems/Default/DatabaseAction.php:499 -#: classes/Gems/Default/StaffAction.php:276 -#: classes/Gems/Default/TrackAction.php:419 -#: classes/Gems/Default/TrackRoundsAction.php:265 -#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:181 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:143 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:147 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:166 -#: classes/Gems/Util/Translated.php:263 -#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:192 -#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:124 msgid "Yes" msgstr "Yes" #: classes/Gems/Controller/BrowseEditAction.php:822 -#: classes/Gems/Default/DatabaseAction.php:188 -#: classes/Gems/Default/DatabaseAction.php:500 -#: classes/Gems/Default/StaffAction.php:277 -#: classes/Gems/Default/TrackAction.php:420 -#: classes/Gems/Default/TrackRoundsAction.php:266 -#: classes/Gems/Snippets/ModelItemYesNoDeleteSnippetAbstract.php:183 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:144 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:148 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:167 -#: classes/Gems/Util/ReceptionCodeLibrary.php:99 -#: classes/Gems/Util/ReceptionCodeLibrary.php:123 -#: classes/Gems/Util/Translated.php:263 -#: classes/MUtil/Snippets/ModelYesNoDeleteSnippetAbstract.php:194 -#: snippets/DeleteSingleSurveyNotUsedTokenSnippet.php:125 msgid "No" msgstr "No" #: classes/Gems/Controller/BrowseEditAction.php:875 -#: classes/Gems/Default/RespondentAction.php:246 -#: classes/Gems/Default/RespondentAction.php:478 -#: classes/Gems/Default/RespondentAction.php:516 -#: classes/Gems/Default/TrackAction.php:554 #, php-format msgid "Unknown %s requested" msgstr "Unknown %s requested" @@ -663,15 +537,10 @@ msgstr "New %1$s..." #: classes/Gems/Controller/BrowseEditAction.php:906 -#: classes/Gems/Email/MailTemplateForm.php:108 -#: classes/Gems/User/Form/ChangePasswordForm.php:341 -#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:245 msgid "Save" msgstr "Save" #: classes/Gems/Controller/BrowseEditAction.php:942 -#: classes/Gems/Default/MailTemplateAction.php:116 -#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:209 #, php-format msgid "%2$u %1$s saved" msgstr "%2$u %1$s saved" @@ -681,31 +550,21 @@ msgstr "No changes to save." #: classes/Gems/Controller/BrowseEditAction.php:954 -#: classes/Gems/Default/RespondentAction.php:307 msgid "Input error! No changes saved!" msgstr "Input error! No changes saved!" #: classes/Gems/Controller/BrowseEditAction.php:982 -#: classes/Gems/Default/SurveyMaintenanceAction.php:593 #, php-format msgid "Show %s" msgstr "Show %s" #: classes/Gems/Controller/BrowseEditAction.php:989 -#: classes/Gems/Default/SurveyMaintenanceAction.php:602 #, php-format msgid "Unknown %s." msgstr "Unknown %s." #: classes/Gems/Controller/ModelActionAbstract.php:97 #: classes/Gems/Default/DatabaseAction.php:503 -#: classes/Gems/Default/SourceAction.php:292 -#: classes/Gems/Default/UpgradeAction.php:184 -#: classes/Gems/Snippets/ModelFormSnippetAbstract.php:171 -#: classes/Gems/Snippets/ModelItemTableSnippetAbstract.php:180 -#: classes/Gems/Tracker/Snippets/ShowRoundSnippetAbstract.php:193 -#: snippets/Generic/CurrentButtonRowSnippet.php:77 -#: snippets/Track/Token/ShowFirstOpenSnippet.php:133 msgid "Cancel" msgstr "Cancel" @@ -729,8 +588,6 @@ msgstr "Showing %s" #: classes/Gems/Controller/ModelSnippetActionAbstract.php:390 -#: classes/Gems/Default/OptionAction.php:181 -#: classes/MUtil/Snippets/ModelFormSnippetAbstract.php:341 msgid "item" msgid_plural "items" msgstr[0] "item" @@ -767,36 +624,22 @@ msgstr "After answering the survey you will be logged off automatically." #: classes/Gems/Default/AskAction.php:100 -msgid "" -"A token consists of two groups of four letters and numbers, separated by an " -"optional hyphen. Tokens are case insensitive." -msgstr "" -"A token consists of two groups of four letters and numbers, separated by an " -"optional hyphen. Tokens are case insensitive." +msgid "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive." +msgstr "A token consists of two groups of four letters and numbers, separated by an optional hyphen. Tokens are case insensitive." #: classes/Gems/Default/AskAction.php:101 -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." +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:136 #, 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." +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:138 #, 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." +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:145 #, php-format @@ -810,26 +653,11 @@ #: classes/Gems/Default/ConsentAction.php:68 #: classes/Gems/Default/GroupAction.php:116 -#: classes/Gems/Default/ReceptionAction.php:81 -#: classes/Gems/Default/RoleAction.php:232 -#: classes/Gems/Default/SurveyMaintenanceAction.php:200 -#: classes/Gems/Default/SurveyMaintenanceAction.php:414 -#: classes/Gems/Default/TrackActionAbstract.php:220 -#: classes/Gems/Default/TrackFieldsAction.php:101 -#: classes/Gems/Default/UpgradeAction.php:176 -#: classes/Gems/Export/RespondentExport.php:225 -#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:758 -#: classes/Gems/Tracker/Model/StandardTokenModel.php:214 -#: classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php:150 -#: classes/Gems/Tracker/Snippets/ShowTrackUsageAbstract.php:147 -#: snippets/TrackSurveyOverviewSnippet.php:115 msgid "Description" msgstr "Description" #: classes/Gems/Default/ConsentAction.php:70 #: classes/Gems/Default/DatabaseAction.php:139 -#: classes/Gems/Default/TrackFieldsAction.php:97 -#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:757 msgid "Order" msgstr "Order" @@ -842,12 +670,8 @@ msgstr "Consent code" #: classes/Gems/Default/ConsentAction.php:75 -msgid "" -"Internal code, not visible to users, copied with the token information to " -"the source." -msgstr "" -"Internal code, not visible to users, copied with the token information to " -"the source." +msgid "Internal code, not visible to users, copied with the token information to the source." +msgstr "Internal code, not visible to users, copied with the token information to the source." #: classes/Gems/Default/ConsentAction.php:92 msgid "respondent consent" @@ -896,14 +720,10 @@ msgstr "No mails sent." #: classes/Gems/Default/CronAction.php:195 -#: classes/Gems/Email/MultiMailForm.php:49 -#: classes/Gems/Email/OneMailForm.php:47 msgid "On this test system all mail will be delivered to the from address." msgstr "On this test system all mail will be delivered to the from address." #: classes/Gems/Default/DatabaseAction.php:75 -#: classes/Gems/Default/ProjectInformationAction.php:192 -#: classes/Gems/Task/CleanCache.php:58 msgid "Cache cleaned" msgstr "Cache cleaned" @@ -913,25 +733,18 @@ msgstr "No rows in %s." #: classes/Gems/Default/DatabaseAction.php:134 -#: classes/Gems/Default/TrackFieldsAction.php:104 -#: classes/Gems/Default/TrackMaintenanceAction.php:229 msgid "Type" msgstr "Type" #: classes/Gems/Default/DatabaseAction.php:138 -#: classes/Gems/Default/SurveyMaintenanceAction.php:435 msgid "Group" msgstr "Group" #: classes/Gems/Default/DatabaseAction.php:140 -#: classes/Gems/Default/OrganizationAction.php:123 msgid "Location" msgstr "Location" #: classes/Gems/Default/DatabaseAction.php:143 -#: classes/Gems/Default/SourceAction.php:210 -#: classes/Gems/Export/RespondentExport.php:148 -#: classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php:157 msgid "Status" msgstr "Status" @@ -942,7 +755,6 @@ #: classes/Gems/Default/DatabaseAction.php:148 #: classes/Gems/Default/DatabaseAction.php:293 #: classes/Gems/Default/DatabaseAction.php:340 -#: classes/Gems/Tracker/Model/StandardTokenModel.php:204 msgid "Changed on" msgstr "Changed on" @@ -1013,9 +825,6 @@ #: classes/Gems/Default/DatabaseAction.php:287 #: classes/Gems/Default/DatabaseAction.php:333 -#: classes/Gems/Default/UpgradeAction.php:126 -#: classes/Gems/Default/UpgradeAction.php:153 -#: classes/Gems/Default/UpgradeAction.php:175 msgid "Level" msgstr "Level" @@ -1048,7 +857,6 @@ msgstr "%d new or changed patch(es)." #: classes/Gems/Default/DatabaseAction.php:303 -#: classes/Gems/Default/ProjectInformationAction.php:137 msgid "Gems build" msgstr "Gems build" @@ -1073,7 +881,6 @@ msgstr "Show patches" #: classes/Gems/Default/DatabaseAction.php:326 -#: classes/Gems/Task/Db/ExecutePatch.php:68 #, php-format msgid "%d patch(es) executed." msgstr "%d patch(es) executed." @@ -1117,7 +924,6 @@ msgstr "Starting %d object creation scripts." #: classes/Gems/Default/DatabaseAction.php:474 -#: classes/Gems/Task/Db/CreateNewTable.php:73 #, php-format msgid "Finished %s creation script for object %d of %d" msgstr "Finished %s creation script for object %d of %d" @@ -1152,7 +958,6 @@ msgstr "Separate multiple commands with semicolons (;)." #: classes/Gems/Default/DatabaseAction.php:522 -#: classes/Gems/Menu/MenuAbstract.php:275 msgid "Run" msgstr "Run" @@ -1196,14 +1001,6 @@ msgstr "Not patient nr, but respondent id as exported here." #: classes/Gems/Default/ExportAction.php:154 -#: classes/Gems/Default/MailJobAction.php:100 -#: classes/Gems/Default/ProjectSurveysAction.php:67 -#: classes/Gems/Default/SurveyAction.php:193 -#: classes/Gems/Email/OneMailForm.php:57 -#: classes/Gems/Export/RespondentExport.php:145 -#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:755 -#: classes/Gems/Tracker/Model/StandardTokenModel.php:215 -#: snippets/TrackSurveyOverviewSnippet.php:111 msgid "Survey" msgstr "Survey" @@ -1225,40 +1022,25 @@ msgstr "Export data" #: classes/Gems/Default/GroupAction.php:71 -#: classes/Gems/Default/ReceptionAction.php:55 msgid "Can be assigned to" msgstr "Can be assigned to" #: classes/Gems/Default/GroupAction.php:117 #: classes/Gems/Default/LogAction.php:201 -#: classes/Gems/Default/RoleAction.php:298 msgid "Role" msgstr "Role" #: classes/Gems/Default/GroupAction.php:120 -#: classes/Gems/Default/MailJobAction.php:82 -#: classes/Gems/Default/OrganizationAction.php:147 -#: classes/Gems/Default/ReceptionAction.php:87 -#: classes/Gems/Default/SourceAction.php:101 -#: classes/Gems/Default/SurveyMaintenanceAction.php:426 -#: classes/Gems/Default/SurveyMaintenanceAction.php:481 -#: classes/Gems/Tracker/Engine/TrackEngineAbstract.php:761 -#: classes/Gems/Tracker/Model/TrackModel.php:102 -#: classes/Gems/Util/TrackData.php:147 msgid "Active" msgstr "Active" #: classes/Gems/Default/GroupAction.php:125 -#: classes/Gems/Default/OrganizationAction.php:171 msgid "Allowed IP Ranges" msgstr "Allowed IP Ranges" #: classes/Gems/Default/GroupAction.php:126 -#: classes/Gems/Default/OrganizationAction.php:172 -msgid "" -"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)" -msgstr "" -"Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)" +msgid "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)" +msgstr "Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)" #: classes/Gems/Default/GroupAction.php:136 msgid "group" @@ -1283,12 +1065,8 @@ msgstr "Please enter your username or e-mail address. " #: classes/Gems/Default/IndexAction.php:182 -msgid "" -"We will then send you an e-mail with a link. The link will bring you to a " -"page where you can set a new password of your choice." -msgstr "" -"We will then send you an e-mail with a link. The link will bring you to a " -"page where you can set a new password of your choice." +msgid "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice." +msgstr "We will then send you an e-mail with a link. The link will bring you to a page where you can set a new password of your choice." #: classes/Gems/Default/IndexAction.php:188 msgid "Execute password reset" @@ -1312,7 +1090,6 @@ msgstr "Please enter your password of choice twice." #: classes/Gems/Default/IndexAction.php:218 -#: classes/Gems/User/Form/LayeredLoginForm.php:258 msgid "Department" msgstr "Department" @@ -1331,26 +1108,18 @@ msgstr "Good bye: %s." #: classes/Gems/Default/IndexAction.php:339 -msgid "" -"Your password reset request is no longer valid, please request a new link." -msgstr "" -"Your password reset request is no longer valid, please request a new link." +msgid "Your password reset request is no longer valid, please request a new link." +msgstr "Your password reset request is no longer valid, please request a new link." #: classes/Gems/Default/IndexAction.php:341 -msgid "" -"Your password input request is no longer valid, please request a new link." -msgstr "" -"Your password input request is no longer valid, please request a new link." +msgid "Your password input request is no longer valid, please request a new link." +msgstr "Your password input request is no longer valid, please request a new link." #: classes/Gems/Default/IndexAction.php:360 -msgid "" -"We sent you an e-mail with a reset link. Click on the link in the e-mail." -msgstr "" -"We sent you an e-mail with a reset link. Click on the link in the e-mail." +msgid "We sent you an e-mail with a reset link. Click on the link in the e-mail." +msgstr "We sent you an e-mail with a reset link. Click on the link in the e-mail." #: classes/Gems/Default/IndexAction.php:369 -#: classes/Gems/Default/OptionAction.php:94 -#: classes/Gems/Default/StaffAction.php:510 msgid "New password is active." msgstr "New password is active." @@ -1363,9 +1132,7 @@ "Dear {greeting},\n" "\n" "\n" -"A new password was requested for your [b]{organization}[/b] account on the " -"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url=" -"{reset_url}]this link[/url] to enter the password of your choice.\n" +"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n" "\n" "\n" "{organization_signature}\n" @@ -1375,9 +1142,7 @@ "Dear {greeting},\n" "\n" "\n" -"A new password was requested for your [b]{organization}[/b] account on the " -"[b]{project}[/b] site, please click within {reset_in_hours} hours on [url=" -"{reset_url}]this link[/url] to enter the password of your choice.\n" +"A new password was requested for your [b]{organization}[/b] account on the [b]{project}[/b] site, please click within {reset_in_hours} hours on [url={reset_url}]this link[/url] to enter the password of your choice.\n" "\n" "\n" "{organization_signature}\n" @@ -1397,32 +1162,26 @@ msgstr "Invalid language setting." #: classes/Gems/Default/LogAction.php:78 -#: classes/Gems/Default/TokenPlanAction.php:243 msgid "from" msgstr "from" #: classes/Gems/Default/LogAction.php:83 -#: classes/Gems/Default/TokenPlanAction.php:248 msgid "until" msgstr "until" #: classes/Gems/Default/LogAction.php:89 -#: classes/Gems/Default/TokenPlanAction.php:254 msgid "days" msgstr "days" #: classes/Gems/Default/LogAction.php:90 -#: classes/Gems/Default/TokenPlanAction.php:255 msgid "weeks" msgstr "weeks" #: classes/Gems/Default/LogAction.php:91 -#: classes/Gems/Default/TokenPlanAction.php:256 msgid "months" msgstr "months" #: classes/Gems/Default/LogAction.php:92 -#: classes/Gems/Default/TokenPlanAction.php:257 msgid "years" msgstr "years" @@ -1459,34 +1218,23 @@ msgstr "All actions" #: classes/Gems/Default/LogAction.php:190 -#: classes/Gems/Default/TrackFieldsAction.php:92 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:472 msgid "Date" msgstr "Date" #: classes/Gems/Default/LogAction.php:191 #: classes/Gems/Default/LogMaintenanceAction.php:52 -#: classes/Gems/Default/UpgradeAction.php:177 msgid "Action" msgstr "Action" #: classes/Gems/Default/LogAction.php:192 -#: classes/Gems/Default/MailTemplateAction.php:66 -#: classes/Gems/Email/EmailFormAbstract.php:168 msgid "Message" msgstr "Message" #: classes/Gems/Default/LogAction.php:198 -#: classes/Gems/Default/TokenPlanAction.php:116 -#: classes/Gems/Snippets/TokenPlanTableSnippet.php:55 -#: snippets/RespondentDetailsSnippet.php:74 -#: snippets/RespondentDetailsWithAssignmentsSnippet.php:148 msgid "Respondent" msgstr "Patient" #: classes/Gems/Default/LogAction.php:202 -#: classes/Gems/Default/OptionAction.php:175 -#: classes/Gems/User/RadiusUserDefinition.php:163 msgid "IP address" msgstr "IP address" @@ -1500,7 +1248,6 @@ msgstr "Log:" #: classes/Gems/Default/LogMaintenanceAction.php:72 -#: snippets/RespondentTokenTabsSnippet.php:69 msgid "All" msgstr "All" @@ -1514,7 +1261,6 @@ #: classes/Gems/Default/MailJobAction.php:78 #: classes/Gems/Default/MailLogAction.php:118 -#: classes/Gems/Email/EmailFormAbstract.php:308 msgid "Template" msgstr "Template" @@ -1581,10 +1327,6 @@ msgstr "Use the 'By staff member' address" #: classes/Gems/Default/MailJobAction.php:133 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:290 -#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:338 -#: snippets/Organization/OrganizationEditSnippet.php:85 -#: snippets/Organization/OrganizationEditSnippet.php:131 msgid "Other" msgstr "Other" @@ -1608,12 +1350,8 @@ msgstr "Turn Automatic Mail Jobs ON" #: classes/Gems/Default/MailJobAction.php:176 -msgid "" -"With automatic mail jobs and a cron job on the server, mails can be sent " -"without manual user action." -msgstr "" -"With automatic mail jobs and a cron job on the server, mails can be sent " -"without manual user action." +msgid "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action." +msgstr "With automatic mail jobs and a cron job on the server, mails can be sent without manual user action." #: classes/Gems/Default/MailLogAction.php:109 msgid "Date sent" @@ -1637,7 +1375,6 @@ #: classes/Gems/Default/MailLogAction.php:115 #: classes/Gems/Default/MailTemplateAction.php:62 -#: classes/Gems/Email/EmailFormAbstract.php:349 msgid "Subject" msgstr "Subject" @@ -1680,7 +1417,6 @@ msgstr "TLS" #: classes/Gems/Default/MailServerAction.php:80 -#: classes/Gems/User/RadiusUserDefinition.php:164 msgid "Port" msgstr "Port" @@ -1693,20 +1429,16 @@ msgstr "User ID" #: classes/Gems/Default/MailServerAction.php:88 -#: classes/Gems/User/Form/LoginForm.php:127 msgid "Password" msgstr "Password" #: classes/Gems/Default/MailServerAction.php:90 #: classes/Gems/Default/SourceAction.php:95 -#: classes/Gems/User/Form/ChangePasswordForm.php:241 -#: classes/Gems/User/Form/ChangePasswordForm.php:287 msgid "Repeat password" msgstr "Repeat password" #: classes/Gems/Default/MailServerAction.php:91 #: classes/Gems/Default/SourceAction.php:74 -#: classes/Gems/User/RadiusUserDefinition.php:169 msgid "Enter only when changing" msgstr "Enter only when changing the password" @@ -1722,8 +1454,6 @@ #: classes/Gems/Default/MailTemplateAction.php:76 #: classes/Gems/Default/RespondentAction.php:349 -#: classes/Gems/Default/StaffAction.php:335 -#: classes/Gems/Default/StaffAction.php:405 msgid "(all organizations)" msgstr "(all organizations)" @@ -1746,9 +1476,8 @@ msgstr "Login Name" #: classes/Gems/Default/OptionAction.php:136 -#: classes/Gems/Default/OrganizationAction.php:143 +#: classes/Gems/Default/OrganizationAction.php:147 #: classes/Gems/Default/RespondentAction.php:195 -#: classes/Gems/Default/StaffAction.php:351 msgid "Language" msgstr "Language" @@ -1758,12 +1487,8 @@ msgstr "Options" #: classes/Gems/Default/OptionAction.php:155 -msgid "" -"This overview provides information about the last login activity on your " -"account." -msgstr "" -"This overview provides information about the last login activity on your " -"account." +msgid "This overview provides information about the last login activity on your account." +msgstr "This overview provides information about the last login activity on your account." #: classes/Gems/Default/OptionAction.php:175 msgid "Date / time" @@ -1773,122 +1498,113 @@ msgid "Item" msgstr "Item" -#: classes/Gems/Default/OrganizationAction.php:100 -#: classes/Gems/Model/HiddenOrganizationModel.php:113 +#: classes/Gems/Default/OrganizationAction.php:104 msgid "Inaccessible or unknown organization" msgstr "Inaccessible or unknown organization" -#: classes/Gems/Default/OrganizationAction.php:124 +#: classes/Gems/Default/OrganizationAction.php:128 msgid "Url" msgstr "Url" -#: classes/Gems/Default/OrganizationAction.php:125 +#: classes/Gems/Default/OrganizationAction.php:129 msgid "Task" msgstr "Task" -#: classes/Gems/Default/OrganizationAction.php:126 +#: classes/Gems/Default/OrganizationAction.php:130 msgid "Contact name" msgstr "Contact name" -#: classes/Gems/Default/OrganizationAction.php:127 +#: classes/Gems/Default/OrganizationAction.php:131 msgid "Contact email" msgstr "Contact email" -#: classes/Gems/Default/OrganizationAction.php:130 +#: classes/Gems/Default/OrganizationAction.php:134 msgid "Style" msgstr "Style" -#: classes/Gems/Default/OrganizationAction.php:135 +#: classes/Gems/Default/OrganizationAction.php:139 msgid "Default url's" msgstr "Default url's" -#: classes/Gems/Default/OrganizationAction.php:137 +#: classes/Gems/Default/OrganizationAction.php:141 #, 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." +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." -#: classes/Gems/Default/OrganizationAction.php:147 +#: classes/Gems/Default/OrganizationAction.php:151 msgid "Can the organization be used?" msgstr "Can the organization be used?" -#: classes/Gems/Default/OrganizationAction.php:148 -#: classes/Gems/User/Form/LoginForm.php:151 +#: classes/Gems/Default/OrganizationAction.php:152 msgid "Login" msgstr "Login" -#: classes/Gems/Default/OrganizationAction.php:148 +#: classes/Gems/Default/OrganizationAction.php:152 msgid "Can people login for this organization?" msgstr "Can people login for this organization?" -#: classes/Gems/Default/OrganizationAction.php:149 +#: classes/Gems/Default/OrganizationAction.php:153 msgid "Accepting" msgstr "Accepting" -#: classes/Gems/Default/OrganizationAction.php:149 +#: classes/Gems/Default/OrganizationAction.php:153 msgid "Can new respondents be added to the organization?" msgstr "Can new patients be added to the organization?" -#: classes/Gems/Default/OrganizationAction.php:150 +#: classes/Gems/Default/OrganizationAction.php:154 msgid "Does the organization have respondents?" msgstr "Does the organization have patients?" -#: classes/Gems/Default/OrganizationAction.php:151 +#: classes/Gems/Default/OrganizationAction.php:155 msgid "Respondent group" msgstr "Patient group" -#: classes/Gems/Default/OrganizationAction.php:151 +#: classes/Gems/Default/OrganizationAction.php:155 msgid "Allows respondents to login." msgstr "Allow patients to login." -#: classes/Gems/Default/OrganizationAction.php:155 +#: classes/Gems/Default/OrganizationAction.php:159 msgid "Greeting" msgstr "Greeting" -#: classes/Gems/Default/OrganizationAction.php:155 -#: classes/Gems/Default/OrganizationAction.php:156 +#: classes/Gems/Default/OrganizationAction.php:159 +#: classes/Gems/Default/OrganizationAction.php:160 msgid "For emails and token forward screen." msgstr "For emails and token forward screen." -#: classes/Gems/Default/OrganizationAction.php:156 +#: classes/Gems/Default/OrganizationAction.php:160 msgid "Signature" msgstr "Signature" -#: classes/Gems/Default/OrganizationAction.php:158 +#: classes/Gems/Default/OrganizationAction.php:162 msgid "Accessible by" msgstr "Accessible by" -#: classes/Gems/Default/OrganizationAction.php:158 +#: classes/Gems/Default/OrganizationAction.php:162 msgid "Checked organizations see this organizations respondents." msgstr "Checked organizations see this organizations patients." -#: classes/Gems/Default/OrganizationAction.php:168 -#: classes/Gems/Default/SurveyMaintenanceAction.php:443 +#: classes/Gems/Default/OrganizationAction.php:172 msgid "Code name" msgstr "Code name" -#: classes/Gems/Default/OrganizationAction.php:168 -#: classes/Gems/Default/SurveyMaintenanceAction.php:443 +#: classes/Gems/Default/OrganizationAction.php:172 msgid "Only for programmers." msgstr "Only for programmers." -#: classes/Gems/Default/OrganizationAction.php:186 +#: classes/Gems/Default/OrganizationActio... [truncated message content] |