Merge branch 'master' of https://github.com/joni2back/angular-filemanager

Author: joni2back

bridges/php-local/LocalBridge/FileManagerApi.php

@@ -166,6 +166,8 @@ public function postHandler($query, $request, $files)
 
     public function getHandler($queries)
     {
+        $t = $this->translate;
+        
         switch ($queries['action']) {
             case 'download':
                 $downloaded = $this->downloadAction($queries['path']);
@@ -473,4 +475,4 @@ private function parsePerms($perms)
 
         return $info;
     }
-}
+}

src/templates/modals.html

@@ -327,9 +327,9 @@ <h4 class="modal-title">{{'change_permissions' | translate}}</h4>
                   <thead>
                       <tr>
                           <th>{{'permissions' | translate}}</th>
-                          <th class="col-xs-1 text-center">{{'exec' | translate}}</th>
                           <th class="col-xs-1 text-center">{{'read' | translate}}</th>
                           <th class="col-xs-1 text-center">{{'write' | translate}}</th>
+                          <th class="col-xs-1 text-center">{{'exec' | translate}}</th>
                       </tr>
                   </thead>
                   <tbody>
@@ -442,4 +442,4 @@ <h4 class="modal-title">{{"select_destination_folder" | translate}}</h4>
       </li>
     </ul>
   </div>
-</script>
+</script>