Fixed issues with tr.sget in templates

modules/article/tmpl/form.twig

@@ -18,7 +18,7 @@
       {% for lang in cfg_langs %}
         <a href="#article/translate/{{ lang.id }}/{{ art.id }}"
            class="btn btn-default"
-           title="{{ tr.sget('translate_article_in', lang.string) }}">
+           title="{{ tr.sget('translate_article_in', [lang.string]) }}">
           <i class="fa fa-random"></i>
           {{ lang.id|upper }}
         </a>

modules/article/tmpl/list.twig

@@ -38,7 +38,7 @@
   <div class="well well-sm clearfix delete-tag-container" style="margin: 10px 0 20px 0; display: none;">
     <span class="text-danger">
       <i style="font-size:1.5em;" class="fa fa-exclamation-triangle"></i>
-      {{ tr.sget('confirm_delete_tag_not_used', active_tags[0]) }}</span>
+      {{ tr.sget('confirm_delete_tag_not_used', [active_tags[0]]) }}</span>
       <button class="btn btn-danger deleteTag"><i class="fa fa-trash"></i> {{ tr.get('delete') }}</button>
       <button class="btn btn-danger deleteAllTags"><i class="fa fa-trash"></i> {{ tr.get('delete_unused_tags') }}</button>
   </div>

modules/article/tmpl/transl_form.twig

@@ -4,7 +4,7 @@
  * @license    AGPL-3.0; see LICENSE file
 #}
 
-<h3>{{ tr.sget('translate_article_in', lang_arr.string|upper) }}</h3>
+<h3>{{ tr.sget('translate_article_in', [lang_arr.string|upper]) }}</h3>
 <form action="javascript:void(0)" id ="form{{ uid }}">
 
   <input type="hidden" name="id" value="{{ transl.id }}" />

modules/downloads/tmpl/editNode.twig

@@ -13,7 +13,7 @@
     {% endif %}
     <a class="btn btn-default reload" onclick="admin.tabs.reloadThis(this);" title="{{ tr.get('reload') }}"><i class="fa fa-refresh"></i> {{ tr.get('reload') }}</a>
     {% for lng in langs %}
-    <a class="btn btn-default" href="#downloads/edit/{{ node }}/{{ lng.id }}" title="{{ tr.sget('translation_in_lang', lng.string|capitalize) }}"><i class="fa fa-random"></i> {{ tr.sget('translation_in_lang', lng.string|capitalize) }}</a>
+    <a class="btn btn-default" href="#downloads/edit/{{ node }}/{{ lng.id }}" title="{{ tr.sget('translation_in_lang', [lng.string|capitalize]) }}"><i class="fa fa-random"></i> {{ tr.sget('translation_in_lang', [lng.string|capitalize]) }}</a>
     {% endfor %}
   </div>
 

modules/galleries/tmpl/editGal.twig

@@ -23,7 +23,7 @@
     <div class="pull-left form-inline">
       {% if max_img_size %}
         <div class="text-warning">
-          {{ tr.sget('max_img_size_warning', max_img_size) }}
+          {{ tr.sget('max_img_size_warning', [max_img_size]) }}
         </div>
       {% endif %}
       <div class="uploader"></div>

modules/protectedtags/tmpl/email_form.twig

@@ -69,19 +69,19 @@ $('#{{ uid }} select[name="tags[]"]').select2({ tags: true });
 var form = $('#{{ uid }} form');
 form.on('submit', function(){
   if (!form.find('input[name="from"]').val()){
-    admin.message('{{ tr.sget('missing_required', tr.get('from')) }}', 'error');
+    admin.message('{{ tr.sget('missing_required', [tr.get('from')]) }}', 'error');
     return;
   }
   if (form.find('select[name="tags[]"]').val() === []){
-    admin.message('{{ tr.sget('missing_required', tr.get('tags')) }}', 'error');
+    admin.message('{{ tr.sget('missing_required', [tr.get('tags')]) }}', 'error');
     return;
   }
   if (!form.find('input[name="subject"]').val()){
-    admin.message('{{ tr.sget('missing_required', tr.get('subject')) }}', 'error');
+    admin.message('{{ tr.sget('missing_required', [tr.get('subject')]) }}', 'error');
     return;
   }
   if (!form.find('textarea[name="text"]').val()){
-    admin.message('{{ tr.sget('missing_required', tr.get('text')) }}', 'error');
+    admin.message('{{ tr.sget('missing_required', [tr.get('text')]) }}', 'error');
     return;
   }
   form.hide();

modules/protectedtags/tmpl/users.twig

@@ -252,19 +252,19 @@ function openEditForm(id){
       var form = body.find('form.new_protectd_pages_user');
       form.on('submit', function(){
         if (!form.find('input[name="name"]').val()){
-          admin.message('{{ tr.sget('missing_required', tr.get('name')) }}', 'error');
+          admin.message('{{ tr.sget('missing_required', [tr.get('name')]) }}', 'error');
           return;
         }
         if (!form.find('input[name="email"]').val()){
-          admin.message('{{ tr.sget('missing_required', tr.get('email_address')) }}', 'error');
+          admin.message('{{ tr.sget('missing_required', [tr.get('email_address')]) }}', 'error');
           return;
         }
         if (!form.find('input[name="password"]').val()){
-          admin.message('{{ tr.sget('missing_required', tr.get('password')) }}', 'error');
+          admin.message('{{ tr.sget('missing_required', [tr.get('password')]) }}', 'error');
           return;
         }
         if (form.find('select[name="tags[]"]').val() === []){
-          admin.message('{{ tr.sget('missing_required', tr.get('tags')) }}', 'error');
+          admin.message('{{ tr.sget('missing_required', [tr.get('tags')]) }}', 'error');
           return;
         }
         $.post(

modules/update/tmpl/update.twig

@@ -11,7 +11,7 @@
 
   <div class="row">
     <div class="col-sm-5">
-      <p class="lead">{{ tr.sget('you_are_running_v', curr_v) }}</p>
+      <p class="lead">{{ tr.sget('you_are_running_v', [curr_v]) }}</p>
       <p>
         <button class="btn btn-info btn-lg check_update"><i class="fa fa-play-circle"></i> {{ tr.get('check_for_updates') }}</button>
       </p>

version

@@ -1,3 +1,4 @@
+5.5.11[] = "Fixed issues with tr.sget in templates"
 5.5.10[] = "Intellisense suggestions fixed"
 5.5.9[] = "Changes in userform"
 5.5.9[] = "Minor code fixes"