Fix: Unknown '__s' function (#103)

Author: Rom1-B

templates/config.html.twig

@@ -30,7 +30,7 @@
 
 <div class="hr-text">
     <i class="fa-2x ti ti-sitemap"></i>
-    <span>{{ __s('Treeview - Configuration', 'treeview') }}</span>
+    <span>{{ __('Treeview - Configuration', 'treeview') }}</span>
 </div>
 
 <form name='form' action='{{ action }}' method='post' class='left'>
@@ -41,64 +41,64 @@
         'target',
         current_config['target'],
         {
-            '_blank': __s('New window', 'treeview'),
-            'right': __s('The central console', 'treeview')
+            '_blank': __('New window', 'treeview'),
+            'right': __('The central console', 'treeview')
         },
-        __s('Target for all the nodes', 'treeview')
+        __('Target for all the nodes', 'treeview')
     ) }}
 
     {{ fields.checkboxField(
         'folderLinks',
         current_config['folderLinks'],
-        __s('Should folders be links', 'treeview')
+        __('Should folders be links', 'treeview')
     ) }}
 
     {{ fields.checkboxField(
         'useSelection',
         current_config['useSelection'],
-        __s('Nodes can be highlighted', 'treeview')
+        __('Nodes can be highlighted', 'treeview')
     ) }}
 
     {{ fields.checkboxField(
         'useLines',
         current_config['useLines'],
-        __s('Tree is drawn with lines', 'treeview')
+        __('Tree is drawn with lines', 'treeview')
     ) }}
 
     {{ fields.checkboxField(
         'useIcons',
         current_config['useIcons'],
-        __s('Tree is drawn with icons', 'treeview')
+        __('Tree is drawn with icons', 'treeview')
     ) }}
 
     {{ fields.checkboxField(
         'closeSameLevel',
         current_config['closeSameLevel'],
-        __s('Only one node within a parent', 'treeview') ~ ' ' ~ __s('can be expanded at the same time.', 'treeview')
+        __('Only one node within a parent', 'treeview') ~ ' ' ~ __('can be expanded at the same time.', 'treeview')
     ) }}
 
     {{ fields.dropdownArrayField(
         'itemName',
         current_config['itemName'],
         {
-            '0': __s('Name'),
-            '1': __s('Inventory number'),
-            '2': __s('%1$s / %2$s', {'%1$s': __s('Name'), '%2$s': __s('Inventory number')}),
-            '3': __s('%1$s / %2$s', {'%1$s': __s('Inventory number'), '%2$s': __s('Name')})
+            '0': __('Name'),
+            '1': __('Inventory number'),
+            '2': __('%1$s / %2$s', {'%1$s': __('Name'), '%2$s': __('Inventory number')}),
+            '3': __('%1$s / %2$s', {'%1$s': __('Inventory number'), '%2$s': __('Name')})
         },
-        __s('Item name', 'treeview')
+        __('Item name', 'treeview')
     ) }}
 
     {{ fields.dropdownArrayField(
         'locationName',
         current_config['locationName'],
         {
-            '0': __s('Short name', 'treeview'),
-            '1': __s('Long name', 'treeview'),
-            '2': __s('%1$s / %2$s', {'%1$s': __s('Short name', 'treeview'), '%2$s': __s('Comment', 'treeview')}),
-            '3': __s('%1$s / %2$s', {'%1$s': __s('Long name', 'treeview'), '%2$s': __s('Comment', 'treeview')})
+            '0': __('Short name', 'treeview'),
+            '1': __('Long name', 'treeview'),
+            '2': __('%1$s / %2$s', {'%1$s': __('Short name', 'treeview'), '%2$s': __('Comment', 'treeview')}),
+            '3': __('%1$s / %2$s', {'%1$s': __('Long name', 'treeview'), '%2$s': __('Comment', 'treeview')})
         },
-        __s('Location name', 'treeview')
+        __('Location name', 'treeview')
     ) }}
 
     <div class="hr"></div>

templates/preference.html.twig

@@ -30,7 +30,7 @@
 
 <div class="hr-text">
     <i class="fa-2x ti ti-sitemap"></i>
-    <span>{{ __s('Treeview - Configuration', 'treeview') }}</span>
+    <span>{{ __('Treeview - Configuration', 'treeview') }}</span>
 </div>
 
 <form action="{{ target }}" method="post">
@@ -40,7 +40,7 @@
     {{ fields.checkboxField(
         'show_on_load',
         show_on_load,
-        __s('Launch Treeview at GLPI startup', 'treeview')
+        __('Launch Treeview at GLPI startup', 'treeview')
     ) }}
 
     <div class="hr"></div>

templates/profile.html.twig

@@ -30,7 +30,7 @@
 
 <div class="hr-text">
     <i class="fa-2x ti ti-sitemap"></i>
-    <span>{{ __s('Treeview - Configuration', 'treeview') }}</span>
+    <span>{{ __('Treeview - Configuration', 'treeview') }}</span>
 </div>
 
 <form action="{{ target }}" method="post">
@@ -40,7 +40,7 @@
     {{ fields.checkboxField(
         'treeview',
         current_right,
-        __s('Can use the treeview', 'treeview')
+        __('Can use the treeview', 'treeview')
     ) }}
 
     <div class="hr"></div>