Popravek nadaljuj kasneje - pri vecjezicni anketi je bil pri prevodu text vedno v slovenscini

admin/survey/SurveyAdminSettings.php

@@ -300,19 +300,19 @@ class SurveyAdminSettings {
 			
 			// Nadaljuj kasneje
 			if($this->survey_type > 1){
-			echo '<div class="setting_holder">';
+                echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':</span>';
+                echo '<span class="setting_title">'. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':</span>';
-			
+                
-			echo '<div class="setting_item">';
+                echo '<div class="setting_item">';
-			echo '<input type="radio" name="continue_later" value="1" id="continue_later_1"' . ($row['continue_later'] == 1 ? ' checked="checked"' : '') . '>';
+                echo '<input type="radio" name="continue_later" value="1" id="continue_later_1"' . ($row['continue_later'] == 1 ? ' checked="checked"' : '') . '>';
-			echo '<label for="continue_later_1">'.$lang['yes'].'</label>';
+                echo '<label for="continue_later_1">'.$lang['yes'].'</label>';
-			echo '</div>';
+                echo '</div>';
-			echo '<div class="setting_item">';
+                echo '<div class="setting_item">';
-			echo '<input type="radio" name="continue_later" value="0" id="continue_later_0"' . ($row['continue_later'] == 0 ? ' checked="checked"' : '') . '>';
+                echo '<input type="radio" name="continue_later" value="0" id="continue_later_0"' . ($row['continue_later'] == 0 ? ' checked="checked"' : '') . '>';
-			echo '<label for="continue_later_0">'.$lang['no1'].'</label>';
+                echo '<label for="continue_later_0">'.$lang['no1'].'</label>';
-			echo '</div>';
+                echo '</div>';
 
-			echo '</div>';
+                echo '</div>';
 			}
 			
 			// Gumb nazaj

main/survey/app/Controllers/AjaxController.php

@@ -10,6 +10,7 @@ namespace App\Controllers;
 // Osnovni razredi
 use App\Controllers\StatisticController as Statistic;
 use App\Controllers\Vprasanja\VprasanjaController as Vprasanja;
+use App\Controllers\LanguageController as Language;
 use App\Models\Model;
 use Common;
 use Branching;
@@ -23,52 +24,77 @@ use AppSettings;
 class AjaxController extends Controller
 {
     //ajax zahteve
-    public function __construct()
+    public function __construct(){       
-    {
+
         if(empty($_GET['a'])){
 			return '';
 		}
+
+        // inicializiramo jezik za multilang anketo
+        Language::getInstance()->multilang_init();
+
+
         if ($_GET['a'] == 'accept_droppable') {
             $this->ajax_accept_droppable();
-        } elseif ($_GET['a'] == 'accept_ranking') {
+        } 
+        elseif ($_GET['a'] == 'accept_ranking') {
             $this->ajax_accept_ranking();
-        } elseif ($_GET['a'] == 'accept_dragdrop1') {
+        } 
+        elseif ($_GET['a'] == 'accept_dragdrop1') {
             $this->ajax_accept_dragdrop1();
-        } elseif ($_GET['a'] == 'get_dragdrop1_data') {
+        } 
+        elseif ($_GET['a'] == 'get_dragdrop1_data') {
             $this->ajax_get_dragdrop1_data();
-        } elseif ($_GET['a'] == 'delete_dragdrop1_data') {
+        } 
+        elseif ($_GET['a'] == 'delete_dragdrop1_data') {
             $this->ajax_delete_dragdrop1_data();
-        } elseif ($_GET['a'] == 'delete_dragdrop2_data') {
+        } 
+        elseif ($_GET['a'] == 'delete_dragdrop2_data') {
             $this->ajax_delete_dragdrop2_data();
-        } elseif ($_GET['a'] == 'accept_dragdrop_grid') {
+        } 
+        elseif ($_GET['a'] == 'accept_dragdrop_grid') {
             $this->ajax_accept_dragdrop_grid();
-        } elseif ($_GET['a'] == 'accept_sortable_ranking') {
+        } 
+        elseif ($_GET['a'] == 'accept_sortable_ranking') {
             $this->ajax_accept_sortable_ranking();
-        } elseif ($_GET['a'] == 'edit_size') {
+        } 
+        elseif ($_GET['a'] == 'edit_size') {
             $this->ajax_edit_size();
-        } elseif ($_GET['a'] == 'dodaj_ime') {
+        } 
+        elseif ($_GET['a'] == 'dodaj_ime') {
             $this->ajax_dodaj_ime();
-        } elseif ($_GET['a'] == 'spol') {
+        } 
+        elseif ($_GET['a'] == 'spol') {
             $this->ajax_glasovanje_spol();
-        } elseif ($_GET['a'] == 'vote_spol') {
+        } 
+        elseif ($_GET['a'] == 'vote_spol') {
             $this->ajax_glasovanje_vote_spol();
-        } elseif ($_GET['a'] == 'captcha') {
+        } 
+        elseif ($_GET['a'] == 'captcha') {
             $this->ajax_captcha();
-        } elseif ($_GET['a'] == 'skin') {
+        } 
+        elseif ($_GET['a'] == 'skin') {
             $this->ajax_skin();
-        } elseif ($_GET['a'] == 'grupa_for_if') {
+        } 
+        elseif ($_GET['a'] == 'grupa_for_if') {
             $this->ajax_grupa_for_if();
-        } elseif ($_GET['a'] == 'enable_comments') {
+        } 
+        elseif ($_GET['a'] == 'enable_comments') {
             $this->ajax_enable_comments();
-        } elseif ($_GET['a'] == 'continue_later') {
+        } 
+        elseif ($_GET['a'] == 'continue_later') {
             $this->ajax_continue_later();
-        } elseif ($_GET['a'] == 'continue_later_send') {
+        } 
+        elseif ($_GET['a'] == 'continue_later_send') {
             $this->ajax_continue_later_send();
-        } elseif ($_GET['a'] == 'usr_id_data') {
+        } 
+        elseif ($_GET['a'] == 'usr_id_data') {
             $this->ajax_delete_signature_data();
-		}elseif ($_GET['a'] == 'get_tip_opozorila') {
+		}
+        elseif ($_GET['a'] == 'get_tip_opozorila') {
             $this->ajax_get_tip_opozorila();
-        } // genericna resitev za vse nadaljne
+        } 
+        // genericna resitev za vse nadaljne
         else {
             $ajax = 'ajax_' . $_GET['a'];
             if (method_exists($this, $ajax))