From f6ac3941d59fbb18d5a6432dc03da0f31e7d4b40 Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Fri, 10 Aug 2012 16:29:10 +0200 Subject: [PATCH 1/3] Fixed issue : #6319 Previewgroup can throw error Dev: fixed issue : set $_SESSION['s_lang'] according to existing survey langage (if unique) Dev : before if $langage!= survey['default_langage'] and non other langage, then $_SESSION['s_lang'] is not set --- common_functions.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/common_functions.php b/common_functions.php index 75faf069b27..90f52d9a05d 100644 --- a/common_functions.php +++ b/common_functions.php @@ -3051,15 +3051,17 @@ function SetSurveyLanguage($surveyid, $language) $default_language = $row['language']; } - if (!isset($language) || ($language=='') || (isset($additional_languages) && strpos($additional_languages, $language) === false) - or (isset($default_language) && $default_language == $language) - ) { - // Language not supported, or default language for survey, fall back to survey's default language + if (!isset($language) || ($language=='') + || (isset($additional_languages) && strpos($additional_languages, $language) === false) + || (isset($default_language) && $default_language != $language) + ) + { + // Language not supported, fall back to survey's default language $_SESSION['s_lang'] = $default_language; - //echo "Language not supported, resorting to ".$_SESSION['s_lang']."
"; - } else { + } + else + { $_SESSION['s_lang'] = $language; - //echo "Language will be set to ".$_SESSION['s_lang']."
"; } $clang = new limesurvey_lang($_SESSION['s_lang']); } From b60f1568e6034ce6014328c887f2b85cdb2b36d4 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 11 Aug 2012 00:00:39 +0200 Subject: [PATCH 2/3] Updated translation: German by debianese --- locale/_template/limesurvey.pot | 628 ++++++++++++++++---------------- locale/de/LC_MESSAGES/de.mo | Bin 239107 -> 239108 bytes 2 files changed, 314 insertions(+), 314 deletions(-) diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot index 0522483bea1..e520b9e22b4 100644 --- a/locale/_template/limesurvey.pot +++ b/locale/_template/limesurvey.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: LimeSurvey language file\n" "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n" -"POT-Creation-Date: 2012-08-09 22:00:37+00:00\n" +"POT-Creation-Date: 2012-08-10 22:00:34+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -197,7 +197,7 @@ msgstr "" #: admin/tokens.php:399 admin/tokens.php:413 admin/tokens.php:479 #: admin/tokens.php:1002 admin/tokens.php:2149 admin/tokens.php:2740 #: admin/tokens.php:2790 admin/tokens.php:3227 admin/tokens.php:3233 -#: admin/usercontrol.php:846 admin/vvimport.php:121 common_functions.php:5510 +#: admin/usercontrol.php:846 admin/vvimport.php:121 common_functions.php:5512 #: index.php:567 msgid "Error" msgstr "" @@ -687,7 +687,7 @@ msgstr "" #: admin/exportresults.php:434 admin/exportresults.php:435 #: admin/exportresults.php:757 admin/tokens.php:1025 admin/tokens.php:1028 #: admin/tokens.php:1029 admin/tokens.php:2335 admin/tokens.php:2471 -#: common_functions.php:6242 replacements.php:515 +#: common_functions.php:6244 replacements.php:515 msgid "First name" msgstr "" @@ -695,7 +695,7 @@ msgstr "" #: admin/exportresults.php:429 admin/exportresults.php:430 #: admin/exportresults.php:760 admin/tokens.php:1035 admin/tokens.php:1038 #: admin/tokens.php:1039 admin/tokens.php:2339 admin/tokens.php:2473 -#: common_functions.php:6243 replacements.php:522 +#: common_functions.php:6245 replacements.php:522 msgid "Last name" msgstr "" @@ -1036,21 +1036,21 @@ msgstr "" #: classes/expressions/LimeExpressionManager.php:2822 #: classes/expressions/LimeExpressionManager.php:2826 common_functions.php:1898 #: common_functions.php:1904 common_functions.php:1920 -#: common_functions.php:3206 common_functions.php:3290 -#: common_functions.php:3397 common_functions.php:3410 -#: common_functions.php:3421 common_functions.php:3432 -#: common_functions.php:3443 common_functions.php:3481 -#: common_functions.php:3511 common_functions.php:3522 -#: common_functions.php:3613 common_functions.php:3624 -#: common_functions.php:3636 common_functions.php:3648 -#: common_functions.php:3678 common_functions.php:3691 -#: common_functions.php:3702 common_functions.php:3713 -#: common_functions.php:3732 common_functions.php:3751 -#: common_functions.php:3762 common_functions.php:3773 -#: common_functions.php:3816 common_functions.php:3842 -#: common_functions.php:3877 common_functions.php:3943 -#: common_functions.php:3953 common_functions.php:4067 -#: common_functions.php:4078 common_functions.php:4138 qanda.php:3769 +#: common_functions.php:3208 common_functions.php:3292 +#: common_functions.php:3399 common_functions.php:3412 +#: common_functions.php:3423 common_functions.php:3434 +#: common_functions.php:3445 common_functions.php:3483 +#: common_functions.php:3513 common_functions.php:3524 +#: common_functions.php:3615 common_functions.php:3626 +#: common_functions.php:3638 common_functions.php:3650 +#: common_functions.php:3680 common_functions.php:3693 +#: common_functions.php:3704 common_functions.php:3715 +#: common_functions.php:3734 common_functions.php:3753 +#: common_functions.php:3764 common_functions.php:3775 +#: common_functions.php:3818 common_functions.php:3844 +#: common_functions.php:3879 common_functions.php:3945 +#: common_functions.php:3955 common_functions.php:4069 +#: common_functions.php:4080 common_functions.php:4140 qanda.php:3769 #: qanda.php:4191 qanda.php:4230 msgid "Yes" msgstr "" @@ -1103,22 +1103,22 @@ msgstr "" #: admin/surveylist.php:56 admin/tokens.php:1508 admin/tokens.php:1806 #: admin/tokens.php:2094 classes/expressions/LimeExpressionManager.php:2823 #: classes/expressions/LimeExpressionManager.php:2827 common_functions.php:1905 -#: common_functions.php:1921 common_functions.php:3205 -#: common_functions.php:3289 common_functions.php:3396 -#: common_functions.php:3411 common_functions.php:3422 -#: common_functions.php:3433 common_functions.php:3444 -#: common_functions.php:3482 common_functions.php:3510 -#: common_functions.php:3521 common_functions.php:3612 -#: common_functions.php:3623 common_functions.php:3635 -#: common_functions.php:3647 common_functions.php:3677 -#: common_functions.php:3690 common_functions.php:3701 -#: common_functions.php:3712 common_functions.php:3731 -#: common_functions.php:3750 common_functions.php:3761 -#: common_functions.php:3772 common_functions.php:3815 -#: common_functions.php:3827 common_functions.php:3841 -#: common_functions.php:3876 common_functions.php:3942 -#: common_functions.php:3952 common_functions.php:4066 -#: common_functions.php:4077 common_functions.php:4137 qanda.php:3776 +#: common_functions.php:1921 common_functions.php:3207 +#: common_functions.php:3291 common_functions.php:3398 +#: common_functions.php:3413 common_functions.php:3424 +#: common_functions.php:3435 common_functions.php:3446 +#: common_functions.php:3484 common_functions.php:3512 +#: common_functions.php:3523 common_functions.php:3614 +#: common_functions.php:3625 common_functions.php:3637 +#: common_functions.php:3649 common_functions.php:3679 +#: common_functions.php:3692 common_functions.php:3703 +#: common_functions.php:3714 common_functions.php:3733 +#: common_functions.php:3752 common_functions.php:3763 +#: common_functions.php:3774 common_functions.php:3817 +#: common_functions.php:3829 common_functions.php:3843 +#: common_functions.php:3878 common_functions.php:3944 +#: common_functions.php:3954 common_functions.php:4068 +#: common_functions.php:4079 common_functions.php:4139 qanda.php:3776 #: qanda.php:4193 qanda.php:4245 msgid "No" msgstr "" @@ -1171,8 +1171,8 @@ msgstr "" #: admin/statistics_function.php:2567 admin/statistics_function.php:2581 #: admin/statistics_function.php:2642 admin/statistics_function.php:2705 #: admin/statistics_function.php:2772 common_functions.php:1906 -#: common_functions.php:1914 common_functions.php:5496 -#: common_functions.php:5501 qanda.php:926 qanda.php:1455 qanda.php:1732 +#: common_functions.php:1914 common_functions.php:5498 +#: common_functions.php:5503 qanda.php:926 qanda.php:1455 qanda.php:1732 #: qanda.php:1836 qanda.php:1891 qanda.php:3785 qanda.php:3830 qanda.php:3919 #: qanda.php:3983 qanda.php:4072 qanda.php:4118 qanda.php:4196 qanda.php:4262 #: qanda.php:4344 qanda.php:4422 qanda.php:4523 qanda.php:4545 qanda.php:4613 @@ -1232,11 +1232,11 @@ msgstr "" #: admin/statistics_function.php:1917 admin/statistics_function.php:2049 #: common_functions.php:1890 common_functions.php:1948 #: common_functions.php:2534 common_functions.php:2799 -#: common_functions.php:3643 common_functions.php:3657 -#: common_functions.php:3673 common_functions.php:3728 -#: common_functions.php:3747 common_functions.php:3905 -#: common_functions.php:4086 common_functions.php:4095 -#: common_functions.php:4104 common_functions.php:4113 qanda.php:1698 +#: common_functions.php:3645 common_functions.php:3659 +#: common_functions.php:3675 common_functions.php:3730 +#: common_functions.php:3749 common_functions.php:3907 +#: common_functions.php:4088 common_functions.php:4097 +#: common_functions.php:4106 common_functions.php:4115 qanda.php:1698 #: qanda.php:2338 qanda.php:2576 msgid "Other" msgstr "" @@ -1827,9 +1827,9 @@ msgstr "" #: admin/dataentry.php:1932 admin/dataentry.php:1944 admin/labels.php:78 #: admin/translate_functions.php:148 common_functions.php:646 #: common_functions.php:700 common_functions.php:1311 common_functions.php:1336 -#: common_functions.php:1411 common_functions.php:4831 -#: common_functions.php:4880 common_functions.php:4916 -#: common_functions.php:4952 qanda.php:1253 qanda.php:1431 qanda.php:6155 +#: common_functions.php:1411 common_functions.php:4833 +#: common_functions.php:4882 common_functions.php:4918 +#: common_functions.php:4954 qanda.php:1253 qanda.php:1431 qanda.php:6155 #: qanda.php:6209 msgid "Please choose..." msgstr "" @@ -1979,7 +1979,7 @@ msgid "Quick-add answers" msgstr "" #: admin/editansweroptions.php:119 admin/editansweroptions.php:148 -#: admin/labels.php:327 common_functions.php:3255 +#: admin/labels.php:327 common_functions.php:3257 msgid "Assessment value" msgstr "" @@ -2967,7 +2967,7 @@ msgstr "" #: admin/exportresults.php:234 admin/exportresults.php:439 #: admin/exportresults.php:440 admin/saved.php:81 admin/tokens.php:1045 -#: admin/tokens.php:1048 admin/tokens.php:1049 common_functions.php:6244 +#: admin/tokens.php:1048 admin/tokens.php:1049 common_functions.php:6246 #: replacements.php:529 msgid "Email address" msgstr "" @@ -3052,7 +3052,7 @@ msgstr "" #: admin/fck_LimeReplacementFields.php:149 #: admin/fck_LimeReplacementFields.php:165 #: admin/fck_LimeReplacementFields.php:222 admin/tokens.php:1125 -#: admin/tokens.php:1128 admin/tokens.php:1129 common_functions.php:6250 +#: admin/tokens.php:1128 admin/tokens.php:1129 common_functions.php:6252 msgid "Uses left" msgstr "" @@ -3323,8 +3323,8 @@ msgstr "" #: admin/globalsettings.php:254 admin/globalsettings.php:265 #: admin/globalsettings.php:317 admin/globalsettings.php:329 #: admin/globalsettings.php:350 admin/globalsettings.php:370 -#: admin/globalsettings.php:443 admin/tokens.php:838 common_functions.php:3453 -#: common_functions.php:3661 +#: admin/globalsettings.php:443 admin/tokens.php:838 common_functions.php:3455 +#: common_functions.php:3663 msgid "Off" msgstr "" @@ -3583,7 +3583,7 @@ msgid "HTML editor mode" msgstr "" #: admin/html.php:118 admin/html.php:129 admin/html.php:139 -#: admin/login_check.php:229 common_functions.php:3908 +#: admin/login_check.php:229 common_functions.php:3910 msgid "Default" msgstr "" @@ -3781,8 +3781,8 @@ msgstr "" #: admin/html.php:611 admin/tokens.php:823 admin/tokens.php:857 #: common_functions.php:651 common_functions.php:654 common_functions.php:1312 #: common_functions.php:1337 common_functions.php:1412 -#: common_functions.php:3896 common_functions.php:4881 -#: common_functions.php:4917 +#: common_functions.php:3898 common_functions.php:4883 +#: common_functions.php:4919 msgid "None" msgstr "" @@ -3802,7 +3802,7 @@ msgstr "" msgid "No next question group" msgstr "" -#: admin/html.php:663 admin/html.php:1085 common_functions.php:3243 +#: admin/html.php:663 admin/html.php:1085 common_functions.php:3245 msgid "Disabled" msgstr "" @@ -9638,923 +9638,923 @@ msgstr "" msgid "Question time" msgstr "" -#: common_functions.php:3202 common_functions.php:3213 -#: common_functions.php:3259 common_functions.php:3267 -#: common_functions.php:3278 common_functions.php:3286 -#: common_functions.php:3297 common_functions.php:3305 -#: common_functions.php:3313 common_functions.php:3321 -#: common_functions.php:3329 common_functions.php:3337 -#: common_functions.php:3507 common_functions.php:3518 -#: common_functions.php:3585 common_functions.php:3593 -#: common_functions.php:3601 common_functions.php:3609 -#: common_functions.php:3620 common_functions.php:3687 -#: common_functions.php:3720 common_functions.php:3739 -#: common_functions.php:3758 common_functions.php:3823 -#: common_functions.php:3857 common_functions.php:3865 -#: common_functions.php:3873 common_functions.php:3884 -#: common_functions.php:3893 +#: common_functions.php:3204 common_functions.php:3215 +#: common_functions.php:3261 common_functions.php:3269 +#: common_functions.php:3280 common_functions.php:3288 +#: common_functions.php:3299 common_functions.php:3307 +#: common_functions.php:3315 common_functions.php:3323 +#: common_functions.php:3331 common_functions.php:3339 +#: common_functions.php:3509 common_functions.php:3520 +#: common_functions.php:3587 common_functions.php:3595 +#: common_functions.php:3603 common_functions.php:3611 +#: common_functions.php:3622 common_functions.php:3689 +#: common_functions.php:3722 common_functions.php:3741 +#: common_functions.php:3760 common_functions.php:3825 +#: common_functions.php:3859 common_functions.php:3867 +#: common_functions.php:3875 common_functions.php:3886 +#: common_functions.php:3895 msgid "Display" msgstr "" -#: common_functions.php:3208 +#: common_functions.php:3210 msgid "Sort the answer options alphabetically" msgstr "" -#: common_functions.php:3209 +#: common_functions.php:3211 msgid "Sort answers alphabetically" msgstr "" -#: common_functions.php:3218 +#: common_functions.php:3220 msgid "Set the percentage width of the answer column (1-100)" msgstr "" -#: common_functions.php:3219 +#: common_functions.php:3221 msgid "Answer width" msgstr "" -#: common_functions.php:3223 common_functions.php:3231 -#: common_functions.php:3239 common_functions.php:3250 -#: common_functions.php:3353 common_functions.php:3361 -#: common_functions.php:3369 common_functions.php:3377 -#: common_functions.php:3385 common_functions.php:3393 -#: common_functions.php:3529 common_functions.php:3561 -#: common_functions.php:3698 common_functions.php:3709 -#: common_functions.php:4122 +#: common_functions.php:3225 common_functions.php:3233 +#: common_functions.php:3241 common_functions.php:3252 +#: common_functions.php:3355 common_functions.php:3363 +#: common_functions.php:3371 common_functions.php:3379 +#: common_functions.php:3387 common_functions.php:3395 +#: common_functions.php:3531 common_functions.php:3563 +#: common_functions.php:3700 common_functions.php:3711 +#: common_functions.php:4124 msgid "Logic" msgstr "" -#: common_functions.php:3226 +#: common_functions.php:3228 msgid "Enter the code(s) of Multiple choice question(s) (separated by semicolons) to only show the matching answer options in this question." msgstr "" -#: common_functions.php:3227 +#: common_functions.php:3229 msgid "Array filter" msgstr "" -#: common_functions.php:3234 +#: common_functions.php:3236 msgid "Enter the code(s) of Multiple choice question(s) (separated by semicolons) to exclude the matching answer options in this question." msgstr "" -#: common_functions.php:3235 +#: common_functions.php:3237 msgid "Array filter exclusion" msgstr "" -#: common_functions.php:3242 +#: common_functions.php:3244 msgid "Hidden" msgstr "" -#: common_functions.php:3245 +#: common_functions.php:3247 msgid "Specify how array-filtered sub-questions should be displayed" msgstr "" -#: common_functions.php:3246 +#: common_functions.php:3248 msgid "Array filter style" msgstr "" -#: common_functions.php:3254 +#: common_functions.php:3256 msgid "If one of the subquestions is marked then for each marked subquestion this value is added as assessment." msgstr "" -#: common_functions.php:3262 common_functions.php:3263 +#: common_functions.php:3264 common_functions.php:3265 msgid "Category separator" msgstr "" -#: common_functions.php:3273 +#: common_functions.php:3275 msgid "The answer options will be distributed across the number of columns set here" msgstr "" -#: common_functions.php:3274 +#: common_functions.php:3276 msgid "Display columns" msgstr "" -#: common_functions.php:3281 +#: common_functions.php:3283 msgid "How many rows to display" msgstr "" -#: common_functions.php:3282 +#: common_functions.php:3284 msgid "Display rows" msgstr "" -#: common_functions.php:3292 +#: common_functions.php:3294 msgid "Use accessible dropdown boxes instead of calendar popup" msgstr "" -#: common_functions.php:3293 +#: common_functions.php:3295 msgid "Display dropdown boxes" msgstr "" -#: common_functions.php:3300 +#: common_functions.php:3302 msgid "Minimum year value in calendar" msgstr "" -#: common_functions.php:3301 +#: common_functions.php:3303 msgid "Minimum year" msgstr "" -#: common_functions.php:3308 +#: common_functions.php:3310 msgid "Maximum year value for calendar" msgstr "" -#: common_functions.php:3309 +#: common_functions.php:3311 msgid "Maximum year" msgstr "" -#: common_functions.php:3316 +#: common_functions.php:3318 msgid "Prefix|Suffix for dropdown lists" msgstr "" -#: common_functions.php:3317 +#: common_functions.php:3319 msgid "Dropdown prefix/suffix" msgstr "" -#: common_functions.php:3324 +#: common_functions.php:3326 msgid "Post-Answer-Separator|Inter-Dropdownlist-Separator for dropdown lists" msgstr "" -#: common_functions.php:3325 +#: common_functions.php:3327 msgid "Dropdown separator" msgstr "" -#: common_functions.php:3332 +#: common_functions.php:3334 msgid "Enter a header text for the first scale" msgstr "" -#: common_functions.php:3333 +#: common_functions.php:3335 msgid "Header for first scale" msgstr "" -#: common_functions.php:3340 +#: common_functions.php:3342 msgid "Enter a header text for the second scale" msgstr "" -#: common_functions.php:3341 +#: common_functions.php:3343 msgid "Header for second scale" msgstr "" -#: common_functions.php:3345 common_functions.php:3537 -#: common_functions.php:3545 common_functions.php:3553 -#: common_functions.php:3569 common_functions.php:3577 -#: common_functions.php:3631 common_functions.php:4134 +#: common_functions.php:3347 common_functions.php:3539 +#: common_functions.php:3547 common_functions.php:3555 +#: common_functions.php:3571 common_functions.php:3579 +#: common_functions.php:3633 common_functions.php:4136 msgid "Input" msgstr "" -#: common_functions.php:3348 +#: common_functions.php:3350 msgid "Multiple numeric inputs sum must equal this value" msgstr "" -#: common_functions.php:3349 +#: common_functions.php:3351 msgid "Equals sum value" msgstr "" -#: common_functions.php:3356 +#: common_functions.php:3358 msgid "Boolean equation to validate the whole question." msgstr "" -#: common_functions.php:3357 +#: common_functions.php:3359 msgid "Question validation equation" msgstr "" -#: common_functions.php:3364 +#: common_functions.php:3366 msgid "Tip to show user describing the question validation equation." msgstr "" -#: common_functions.php:3365 +#: common_functions.php:3367 msgid "Question validation tip" msgstr "" -#: common_functions.php:3372 +#: common_functions.php:3374 msgid "Boolean equation to validate each sub-question." msgstr "" -#: common_functions.php:3373 +#: common_functions.php:3375 msgid "Sub-question validation equation" msgstr "" -#: common_functions.php:3380 +#: common_functions.php:3382 msgid "Tip to show user describing the sub-question validation equation." msgstr "" -#: common_functions.php:3381 +#: common_functions.php:3383 msgid "Sub-question validation tip" msgstr "" -#: common_functions.php:3388 +#: common_functions.php:3390 msgid "Excludes all other options if a certain answer is selected - just enter the answer code(s) seperated with a semikolon." msgstr "" -#: common_functions.php:3389 +#: common_functions.php:3391 msgid "Exclusive option" msgstr "" -#: common_functions.php:3399 +#: common_functions.php:3401 msgid "If the participant marks all options, uncheck all and check the option set in the \"Exclusive option\" setting" msgstr "" -#: common_functions.php:3400 +#: common_functions.php:3402 msgid "Auto-check exclusive option if all others are checked" msgstr "" -#: common_functions.php:3407 common_functions.php:3418 -#: common_functions.php:3429 common_functions.php:3440 -#: common_functions.php:3450 common_functions.php:3460 -#: common_functions.php:3469 common_functions.php:3478 -#: common_functions.php:3488 common_functions.php:3496 +#: common_functions.php:3409 common_functions.php:3420 +#: common_functions.php:3431 common_functions.php:3442 +#: common_functions.php:3452 common_functions.php:3462 +#: common_functions.php:3471 common_functions.php:3480 +#: common_functions.php:3490 common_functions.php:3498 msgid "Location" msgstr "" -#: common_functions.php:3412 +#: common_functions.php:3414 msgid "Store the city?" msgstr "" -#: common_functions.php:3413 +#: common_functions.php:3415 msgid "Save city" msgstr "" -#: common_functions.php:3423 +#: common_functions.php:3425 msgid "Store the state?" msgstr "" -#: common_functions.php:3424 +#: common_functions.php:3426 msgid "Save state" msgstr "" -#: common_functions.php:3434 +#: common_functions.php:3436 msgid "Store the postal code?" msgstr "" -#: common_functions.php:3435 +#: common_functions.php:3437 msgid "Save postal code" msgstr "" -#: common_functions.php:3445 +#: common_functions.php:3447 msgid "Store the country?" msgstr "" -#: common_functions.php:3446 +#: common_functions.php:3448 msgid "Save country" msgstr "" -#: common_functions.php:3454 +#: common_functions.php:3456 msgid "Google Maps" msgstr "" -#: common_functions.php:3455 +#: common_functions.php:3457 msgid "Activate this to show a map above the input field where the user can select a location" msgstr "" -#: common_functions.php:3456 +#: common_functions.php:3458 msgid "Use mapping service" msgstr "" -#: common_functions.php:3464 +#: common_functions.php:3466 msgid "Width of the map in pixel" msgstr "" -#: common_functions.php:3465 +#: common_functions.php:3467 msgid "Map width" msgstr "" -#: common_functions.php:3473 +#: common_functions.php:3475 msgid "Height of the map in pixel" msgstr "" -#: common_functions.php:3474 +#: common_functions.php:3476 msgid "Map height" msgstr "" -#: common_functions.php:3483 +#: common_functions.php:3485 msgid "Get the default location using the user's IP address?" msgstr "" -#: common_functions.php:3484 +#: common_functions.php:3486 msgid "IP as default location" msgstr "" -#: common_functions.php:3491 +#: common_functions.php:3493 msgid "Default coordinates of the map when the page first loads. Format: latitude [space] longtitude" msgstr "" -#: common_functions.php:3492 +#: common_functions.php:3494 msgid "Default position" msgstr "" -#: common_functions.php:3500 +#: common_functions.php:3502 msgid "Map zoom level" msgstr "" -#: common_functions.php:3501 +#: common_functions.php:3503 msgid "Zoom level" msgstr "" -#: common_functions.php:3513 +#: common_functions.php:3515 msgid "Hide the tip that is normally shown with a question" msgstr "" -#: common_functions.php:3514 +#: common_functions.php:3516 msgid "Hide tip" msgstr "" -#: common_functions.php:3524 +#: common_functions.php:3526 msgid "Hide this question at any time. This is useful for including data using answer prefilling." msgstr "" -#: common_functions.php:3525 +#: common_functions.php:3527 msgid "Always hide this question" msgstr "" -#: common_functions.php:3532 +#: common_functions.php:3534 msgid "Limit the number of possible answers" msgstr "" -#: common_functions.php:3533 +#: common_functions.php:3535 msgid "Maximum answers" msgstr "" -#: common_functions.php:3540 +#: common_functions.php:3542 msgid "Maximum sum value of multiple numeric input" msgstr "" -#: common_functions.php:3541 +#: common_functions.php:3543 msgid "Maximum sum value" msgstr "" -#: common_functions.php:3548 +#: common_functions.php:3550 msgid "Maximum value of the numeric input" msgstr "" -#: common_functions.php:3549 common_functions.php:3589 +#: common_functions.php:3551 common_functions.php:3591 msgid "Maximum value" msgstr "" -#: common_functions.php:3556 +#: common_functions.php:3558 msgid "Maximum characters allowed" msgstr "" -#: common_functions.php:3557 +#: common_functions.php:3559 msgid "Maximum characters" msgstr "" -#: common_functions.php:3564 +#: common_functions.php:3566 msgid "Ensure a minimum number of possible answers (0=No limit)" msgstr "" -#: common_functions.php:3565 +#: common_functions.php:3567 msgid "Minimum answers" msgstr "" -#: common_functions.php:3572 +#: common_functions.php:3574 msgid "The sum of the multiple numeric inputs must be greater than this value" msgstr "" -#: common_functions.php:3573 +#: common_functions.php:3575 msgid "Minimum sum value" msgstr "" -#: common_functions.php:3580 +#: common_functions.php:3582 msgid "Minimum value of the numeric input" msgstr "" -#: common_functions.php:3581 common_functions.php:3597 +#: common_functions.php:3583 common_functions.php:3599 msgid "Minimum value" msgstr "" -#: common_functions.php:3588 +#: common_functions.php:3590 msgid "Maximum value for array(mult-flexible) question type" msgstr "" -#: common_functions.php:3596 +#: common_functions.php:3598 msgid "Minimum value for array(multi-flexible) question type" msgstr "" -#: common_functions.php:3604 common_functions.php:3605 +#: common_functions.php:3606 common_functions.php:3607 msgid "Step value" msgstr "" -#: common_functions.php:3615 +#: common_functions.php:3617 msgid "Use checkbox layout" msgstr "" -#: common_functions.php:3616 +#: common_functions.php:3618 msgid "Checkbox layout" msgstr "" -#: common_functions.php:3626 +#: common_functions.php:3628 msgid "Present answer options in reverse order" msgstr "" -#: common_functions.php:3627 +#: common_functions.php:3629 msgid "Reverse answer order" msgstr "" -#: common_functions.php:3638 +#: common_functions.php:3640 msgid "Restrict input to integer values" msgstr "" -#: common_functions.php:3639 +#: common_functions.php:3641 msgid "Integer only" msgstr "" -#: common_functions.php:3651 +#: common_functions.php:3653 msgid "Allow only numerical input" msgstr "" -#: common_functions.php:3652 +#: common_functions.php:3654 msgid "Numbers only" msgstr "" -#: common_functions.php:3662 +#: common_functions.php:3664 msgid "Rows" msgstr "" -#: common_functions.php:3663 +#: common_functions.php:3665 msgid "Columns" msgstr "" -#: common_functions.php:3664 +#: common_functions.php:3666 msgid "Both rows and columns" msgstr "" -#: common_functions.php:3667 +#: common_functions.php:3669 msgid "Show totals for either rows, columns or both rows and columns" msgstr "" -#: common_functions.php:3668 +#: common_functions.php:3670 msgid "Show totals for" msgstr "" -#: common_functions.php:3681 +#: common_functions.php:3683 msgid "Show grand total for either columns or rows" msgstr "" -#: common_functions.php:3682 +#: common_functions.php:3684 msgid "Show grand total" msgstr "" -#: common_functions.php:3693 +#: common_functions.php:3695 msgid "Present as text input boxes instead of dropdown lists" msgstr "" -#: common_functions.php:3694 +#: common_functions.php:3696 msgid "Text inputs" msgstr "" -#: common_functions.php:3704 +#: common_functions.php:3706 msgid "Make the 'Other:' comment field mandatory when the 'Other:' option is active" msgstr "" -#: common_functions.php:3705 +#: common_functions.php:3707 msgid "'Other:' comment mandatory" msgstr "" -#: common_functions.php:3715 +#: common_functions.php:3717 msgid "Allow only numerical input for 'Other' text" msgstr "" -#: common_functions.php:3716 +#: common_functions.php:3718 msgid "Numbers only for 'Other'" msgstr "" -#: common_functions.php:3723 +#: common_functions.php:3725 msgid "Replaces the label of the 'Other:' answer option with a custom text" msgstr "" -#: common_functions.php:3724 +#: common_functions.php:3726 msgid "Label for 'Other:' option" msgstr "" -#: common_functions.php:3734 +#: common_functions.php:3736 msgid "Insert a page break before this question in printable view by setting this to Yes." msgstr "" -#: common_functions.php:3735 +#: common_functions.php:3737 msgid "Insert page break in printable view" msgstr "" -#: common_functions.php:3742 +#: common_functions.php:3744 msgid "Add a prefix to the answer field" msgstr "" -#: common_functions.php:3743 +#: common_functions.php:3745 msgid "Answer prefix" msgstr "" -#: common_functions.php:3753 +#: common_functions.php:3755 msgid "Show statistics of this question in the public statistics page" msgstr "" -#: common_functions.php:3754 +#: common_functions.php:3756 msgid "Show in public statistics" msgstr "" -#: common_functions.php:3764 +#: common_functions.php:3766 msgid "Present answers in random order" msgstr "" -#: common_functions.php:3765 +#: common_functions.php:3767 msgid "Random answer order" msgstr "" -#: common_functions.php:3769 common_functions.php:3780 -#: common_functions.php:3788 common_functions.php:3796 -#: common_functions.php:3804 common_functions.php:3812 -#: common_functions.php:3838 common_functions.php:3849 +#: common_functions.php:3771 common_functions.php:3782 +#: common_functions.php:3790 common_functions.php:3798 +#: common_functions.php:3806 common_functions.php:3814 +#: common_functions.php:3840 common_functions.php:3851 msgid "Slider" msgstr "" -#: common_functions.php:3775 common_functions.php:3776 -#: common_functions.php:3832 common_functions.php:3833 +#: common_functions.php:3777 common_functions.php:3778 +#: common_functions.php:3834 common_functions.php:3835 msgid "Use slider layout" msgstr "" -#: common_functions.php:3783 common_functions.php:3784 +#: common_functions.php:3785 common_functions.php:3786 msgid "Slider minimum value" msgstr "" -#: common_functions.php:3791 common_functions.php:3792 +#: common_functions.php:3793 common_functions.php:3794 msgid "Slider maximum value" msgstr "" -#: common_functions.php:3799 common_functions.php:3800 +#: common_functions.php:3801 common_functions.php:3802 msgid "Slider accuracy" msgstr "" -#: common_functions.php:3807 common_functions.php:3808 +#: common_functions.php:3809 common_functions.php:3810 msgid "Slider initial value" msgstr "" -#: common_functions.php:3818 +#: common_functions.php:3820 msgid "The handle is displayed at the middle of the slider (this will not set the initial value)" msgstr "" -#: common_functions.php:3819 +#: common_functions.php:3821 msgid "Slider starts at the middle position" msgstr "" -#: common_functions.php:3828 +#: common_functions.php:3830 msgid "Yes - stars" msgstr "" -#: common_functions.php:3829 +#: common_functions.php:3831 msgid "Yes - slider with emoticon" msgstr "" -#: common_functions.php:3844 +#: common_functions.php:3846 msgid "Display min and max value under the slider" msgstr "" -#: common_functions.php:3845 +#: common_functions.php:3847 msgid "Display slider min and max value" msgstr "" -#: common_functions.php:3852 +#: common_functions.php:3854 msgid "Answer|Left-slider-text|Right-slider-text separator character" msgstr "" -#: common_functions.php:3853 +#: common_functions.php:3855 msgid "Slider left/right text separator" msgstr "" -#: common_functions.php:3860 +#: common_functions.php:3862 msgid "Add a suffix to the answer field" msgstr "" -#: common_functions.php:3861 +#: common_functions.php:3863 msgid "Answer suffix" msgstr "" -#: common_functions.php:3868 +#: common_functions.php:3870 msgid "Width of text input box" msgstr "" -#: common_functions.php:3869 +#: common_functions.php:3871 msgid "Input box width" msgstr "" -#: common_functions.php:3879 +#: common_functions.php:3881 msgid "Use dropdown boxes instead of list of radio buttons" msgstr "" -#: common_functions.php:3880 +#: common_functions.php:3882 msgid "Use dropdown boxes" msgstr "" -#: common_functions.php:3888 +#: common_functions.php:3890 msgid "For list dropdown boxes, show up to this many rows" msgstr "" -#: common_functions.php:3889 +#: common_functions.php:3891 msgid "Height of dropdown" msgstr "" -#: common_functions.php:3897 +#: common_functions.php:3899 msgid "Order" msgstr "" -#: common_functions.php:3900 +#: common_functions.php:3902 msgid "Accelerator keys for list items" msgstr "" -#: common_functions.php:3901 +#: common_functions.php:3903 msgid "Prefix for list items" msgstr "" -#: common_functions.php:3909 +#: common_functions.php:3911 msgid "Nominal" msgstr "" -#: common_functions.php:3910 +#: common_functions.php:3912 msgid "Ordinal" msgstr "" -#: common_functions.php:3911 +#: common_functions.php:3913 msgid "Scale" msgstr "" -#: common_functions.php:3913 +#: common_functions.php:3915 msgid "Set a specific SPSS export scale type for this question" msgstr "" -#: common_functions.php:3914 +#: common_functions.php:3916 msgid "SPSS export scale type" msgstr "" -#: common_functions.php:3919 common_functions.php:3927 -#: common_functions.php:3938 common_functions.php:3949 -#: common_functions.php:3959 common_functions.php:3967 -#: common_functions.php:3975 common_functions.php:3983 -#: common_functions.php:3991 common_functions.php:3999 -#: common_functions.php:4007 common_functions.php:4015 -#: common_functions.php:4023 common_functions.php:4031 -#: common_functions.php:4039 common_functions.php:4047 -#: common_functions.php:4055 +#: common_functions.php:3921 common_functions.php:3929 +#: common_functions.php:3940 common_functions.php:3951 +#: common_functions.php:3961 common_functions.php:3969 +#: common_functions.php:3977 common_functions.php:3985 +#: common_functions.php:3993 common_functions.php:4001 +#: common_functions.php:4009 common_functions.php:4017 +#: common_functions.php:4025 common_functions.php:4033 +#: common_functions.php:4041 common_functions.php:4049 +#: common_functions.php:4057 msgid "Timer" msgstr "" -#: common_functions.php:3922 +#: common_functions.php:3924 msgid "Limit time to answer question (in seconds)" msgstr "" -#: common_functions.php:3923 +#: common_functions.php:3925 msgid "Time limit" msgstr "" -#: common_functions.php:3930 +#: common_functions.php:3932 msgid "Warn and move on" msgstr "" -#: common_functions.php:3931 +#: common_functions.php:3933 msgid "Move on without warning" msgstr "" -#: common_functions.php:3932 +#: common_functions.php:3934 msgid "Disable only" msgstr "" -#: common_functions.php:3933 +#: common_functions.php:3935 msgid "Action to perform when time limit is up" msgstr "" -#: common_functions.php:3934 +#: common_functions.php:3936 msgid "Time limit action" msgstr "" -#: common_functions.php:3944 +#: common_functions.php:3946 msgid "Disable the next button until time limit expires" msgstr "" -#: common_functions.php:3945 +#: common_functions.php:3947 msgid "Time limit disable next" msgstr "" -#: common_functions.php:3954 +#: common_functions.php:3956 msgid "Disable the prev button until the time limit expires" msgstr "" -#: common_functions.php:3955 +#: common_functions.php:3957 msgid "Time limit disable prev" msgstr "" -#: common_functions.php:3962 +#: common_functions.php:3964 msgid "The text message that displays in the countdown timer during the countdown" msgstr "" -#: common_functions.php:3963 +#: common_functions.php:3965 msgid "Time limit countdown message" msgstr "" -#: common_functions.php:3970 +#: common_functions.php:3972 msgid "CSS Style for the message that displays in the countdown timer during the countdown" msgstr "" -#: common_functions.php:3971 +#: common_functions.php:3973 msgid "Time limit timer CSS style" msgstr "" -#: common_functions.php:3978 +#: common_functions.php:3980 msgid "Display the 'time limit expiry message' for this many seconds before performing the 'time limit action' (defaults to 1 second if left blank)" msgstr "" -#: common_functions.php:3979 +#: common_functions.php:3981 msgid "Time limit expiry message display time" msgstr "" -#: common_functions.php:3986 +#: common_functions.php:3988 msgid "The message to display when the time limit has expired (a default message will display if this setting is left blank)" msgstr "" -#: common_functions.php:3987 +#: common_functions.php:3989 msgid "Time limit expiry message" msgstr "" -#: common_functions.php:3994 +#: common_functions.php:3996 msgid "CSS style for the 'time limit expiry message'" msgstr "" -#: common_functions.php:3995 +#: common_functions.php:3997 msgid "Time limit message CSS style" msgstr "" -#: common_functions.php:4002 +#: common_functions.php:4004 msgid "Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank)" msgstr "" -#: common_functions.php:4003 +#: common_functions.php:4005 msgid "1st time limit warning message timer" msgstr "" -#: common_functions.php:4010 +#: common_functions.php:4012 msgid "The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank)" msgstr "" -#: common_functions.php:4011 +#: common_functions.php:4013 msgid "1st time limit warning message display time" msgstr "" -#: common_functions.php:4018 +#: common_functions.php:4020 msgid "The message to display as a 'time limit warning' (a default warning will display if this is left blank)" msgstr "" -#: common_functions.php:4019 +#: common_functions.php:4021 msgid "1st time limit warning message" msgstr "" -#: common_functions.php:4026 +#: common_functions.php:4028 msgid "CSS style used when the 'time limit warning' message is displayed" msgstr "" -#: common_functions.php:4027 +#: common_functions.php:4029 msgid "1st time limit warning CSS style" msgstr "" -#: common_functions.php:4034 +#: common_functions.php:4036 msgid "Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank)" msgstr "" -#: common_functions.php:4035 +#: common_functions.php:4037 msgid "2nd time limit warning message timer" msgstr "" -#: common_functions.php:4042 +#: common_functions.php:4044 msgid "The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank)" msgstr "" -#: common_functions.php:4043 +#: common_functions.php:4045 msgid "2nd time limit warning message display time" msgstr "" -#: common_functions.php:4050 +#: common_functions.php:4052 msgid "The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank)" msgstr "" -#: common_functions.php:4051 +#: common_functions.php:4053 msgid "2nd time limit warning message" msgstr "" -#: common_functions.php:4058 +#: common_functions.php:4060 msgid "CSS style used when the 2nd 'time limit warning' message is displayed" msgstr "" -#: common_functions.php:4059 +#: common_functions.php:4061 msgid "2nd time limit warning CSS style" msgstr "" -#: common_functions.php:4063 common_functions.php:4074 +#: common_functions.php:4065 common_functions.php:4076 msgid "File metadata" msgstr "" -#: common_functions.php:4069 +#: common_functions.php:4071 msgid "Is the participant required to give a title to the uploaded file?" msgstr "" -#: common_functions.php:4070 +#: common_functions.php:4072 msgid "Show title" msgstr "" -#: common_functions.php:4080 +#: common_functions.php:4082 msgid "Is the participant required to give a comment to the uploaded file?" msgstr "" -#: common_functions.php:4081 +#: common_functions.php:4083 msgid "Show comment" msgstr "" -#: common_functions.php:4090 +#: common_functions.php:4092 msgid "The participant cannot upload a single file larger than this size" msgstr "" -#: common_functions.php:4091 +#: common_functions.php:4093 msgid "Maximum file size allowed (in KB)" msgstr "" -#: common_functions.php:4099 +#: common_functions.php:4101 msgid "Maximum number of files that the participant can upload for this question" msgstr "" -#: common_functions.php:4100 +#: common_functions.php:4102 msgid "Max number of files" msgstr "" -#: common_functions.php:4108 +#: common_functions.php:4110 msgid "Minimum number of files that the participant must upload for this question" msgstr "" -#: common_functions.php:4109 +#: common_functions.php:4111 msgid "Min number of files" msgstr "" -#: common_functions.php:4117 +#: common_functions.php:4119 msgid "Allowed file types in comma separated format. e.g. pdf,doc,odt" msgstr "" -#: common_functions.php:4118 +#: common_functions.php:4120 msgid "Allowed file types" msgstr "" -#: common_functions.php:4125 +#: common_functions.php:4127 msgid "Place questions into a specified randomization group, all questions included in the specified group will appear in a random order" msgstr "" -#: common_functions.php:4126 +#: common_functions.php:4128 msgid "Randomization group name" msgstr "" -#: common_functions.php:4140 +#: common_functions.php:4142 msgid "Is no answer (missing) allowed when either 'Equals sum value' or 'Minimum sum value' are set?" msgstr "" -#: common_functions.php:4141 +#: common_functions.php:4143 msgid "Value range allows missing" msgstr "" -#: common_functions.php:4329 +#: common_functions.php:4331 msgid "Version" msgstr "" -#: common_functions.php:4338 +#: common_functions.php:4340 msgid "Online Manual" msgstr "" -#: common_functions.php:4341 +#: common_functions.php:4343 msgid "Support this project - Donate to " msgstr "" -#: common_functions.php:4344 +#: common_functions.php:4346 msgid "Visit our website!" msgstr "" -#: common_functions.php:4459 +#: common_functions.php:4461 msgid "Email was not sent because demo-mode is activated." msgstr "" -#: common_functions.php:4587 +#: common_functions.php:4589 msgid "SMTP debug output:" msgstr "" -#: common_functions.php:4731 +#: common_functions.php:4733 msgid "SQL command failed: %s Reason: %s" msgstr "" -#: common_functions.php:6245 +#: common_functions.php:6247 msgid "Token code" msgstr "" -#: common_functions.php:6246 +#: common_functions.php:6248 msgid "Language code" msgstr "" -#: common_functions.php:6247 +#: common_functions.php:6249 msgid "Invitation sent date" msgstr "" -#: common_functions.php:6248 +#: common_functions.php:6250 msgid "Last Reminder sent date" msgstr "" -#: common_functions.php:6249 +#: common_functions.php:6251 msgid "Total numbers of sent reminders" msgstr "" -#: common_functions.php:6271 +#: common_functions.php:6273 msgid "Attribute %s" msgstr "" diff --git a/locale/de/LC_MESSAGES/de.mo b/locale/de/LC_MESSAGES/de.mo index 7747f208f9cebc972536dfeabd60749be5706159..b0f0d21e7de3f9716f48591ade18f3a1d14a3542 100644 GIT binary patch delta 17587 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 B7lQx* delta 17587 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 Date: Sat, 11 Aug 2012 01:17:06 +0200 Subject: [PATCH 3/3] Dev: Fix #6319 : Use existing function --- common_functions.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/common_functions.php b/common_functions.php index 90f52d9a05d..715f41142a3 100644 --- a/common_functions.php +++ b/common_functions.php @@ -2992,14 +2992,14 @@ function getSavedCount($surveyid) function GetBaseLanguageFromSurveyID($surveyid) { static $cache = array(); - global $connect; + global $connect,$defaultlang; $surveyid=(int)($surveyid); if (!isset($cache[$surveyid])) { $query = "SELECT language FROM ".db_table_name('surveys')." WHERE sid=$surveyid"; $surveylanguage = $connect->GetOne($query); //Checked if (is_null($surveylanguage)) { - $surveylanguage='en'; + $surveylanguage=$defaultlang; } $cache[$surveyid] = $surveylanguage; } else { @@ -3044,16 +3044,16 @@ function SetSurveyLanguage($surveyid, $language) if (isset($surveyid) && $surveyid>0) { // see if language actually is present in survey - $query = "SELECT language, additional_languages FROM ".db_table_name('surveys')." WHERE sid=$surveyid"; - $result = db_execute_assoc($query); //Checked - while ($result && ($row=$result->FetchRow())) { - $additional_languages = $row['additional_languages']; - $default_language = $row['language']; - } - - if (!isset($language) || ($language=='') - || (isset($additional_languages) && strpos($additional_languages, $language) === false) - || (isset($default_language) && $default_language != $language) +# $query = "SELECT language, additional_languages FROM ".db_table_name('surveys')." WHERE sid=$surveyid"; +# $result = db_execute_assoc($query); //Checked +# while ($result && ($row=$result->FetchRow())) { +# $additional_languages = $row['additional_languages']; +# $default_language = $row['language']; +# } + $default_language=GetBaseLanguageFromSurveyID($surveyid); + $additional_languages=GetAdditionalLanguagesFromSurveyID($surveyid); + if ( !isset($language) || ($language=='') + || !( in_array($language,$additional_languages) || $language==$default_language) ) { // Language not supported, fall back to survey's default language