Adjust for templates

Use new t() for template button text

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 05a938cb2d4c9c59e29b8608f47e7c79605df71e..d25e485b4817ba6c4b6e783f20e582fe948c7e98 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -13,8 +13,8 @@ use Friendica\Object\Image;
 /**
  * @param App $a
  */
-function fbrowser_content(App $a) {
-
+function fbrowser_content(App $a)
+{
        if (!local_user()) {
                killme();
        }
@@ -25,7 +25,7 @@ function fbrowser_content(App $a) {
 
        $template_file = "filebrowser.tpl";
        $mode = "";
-       if (x($_GET,'mode')) {
+       if (x($_GET, 'mode')) {
                $mode  = "?mode=".$_GET['mode'];
        }
 
@@ -36,22 +36,25 @@ function fbrowser_content(App $a) {
                        $sql_extra = "";
                        $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
 
-                       if ($a->argc==2){
+                       if ($a->argc==2) {
                                $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
                                        intval(local_user()),
                                        dbesc('Contact Photos'),
                                        dbesc(L10n::t('Contact Photos'))
                                );
 
-                               function _map_folder1($el){return [bin2hex($el['album']),$el['album']];};
-                               $albums = array_map( "_map_folder1" , $albums);
+                               function _map_folder1($el)
+                               {
+                                       return [bin2hex($el['album']),$el['album']];
+                               };
 
+                               $albums = array_map("_map_folder1", $albums);
                        }
 
                        $album = "";
-                       if ($a->argc==3){
+                       if ($a->argc==3) {
                                $album = hex2bin($a->argv[2]);
-                               $sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+                               $sql_extra = sprintf("AND `album` = '%s' ", dbesc($album));
                                $sql_extra2 = "";
                                $path[]=[$a->argv[2], $album];
                        }
@@ -65,7 +68,8 @@ function fbrowser_content(App $a) {
                                dbesc(L10n::t('Contact Photos'))
                        );
 
-                       function _map_files1($rr){
+                       function _map_files1($rr)
+                       {
                                $a = get_app();
                                $types = Image::supportedTypes();
                                $ext = $types[$rr['type']];
@@ -74,10 +78,11 @@ function fbrowser_content(App $a) {
                                // Take the largest picture that is smaller or equal 640 pixels
                                $p = q("SELECT `scale` FROM `photo` WHERE `resource-id` = '%s' AND `height` <= 640 AND `width` <= 640 ORDER BY `resource-id`, `scale` LIMIT 1",
                                        dbesc($rr['resource-id']));
-                               if ($p)
+                               if ($p) {
                                        $scale = $p[0]["scale"];
-                               else
+                               } else {
                                        $scale = $rr['loq'];
+                               }
 
                                return [
                                        System::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
@@ -97,9 +102,9 @@ function fbrowser_content(App $a) {
                                '$files'    => $files,
                                '$cancel'   => L10n::t('Cancel'),
                                '$nickname' => $a->user['nickname'],
+                               '$upload'       => L10n::t('Upload')
                        ]);
 
-
                        break;
                case "file":
                        if ($a->argc==2) {
@@ -107,9 +112,10 @@ function fbrowser_content(App $a) {
                                        intval(local_user())
                                );
 
-                               function _map_files2($rr){
+                               function _map_files2($rr)
+                               {
                                        $a = get_app();
-                                       list($m1,$m2) = explode("/",$rr['filetype']);
+                                       list($m1,$m2) = explode("/", $rr['filetype']);
                                        $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
                                        $filename_e = $rr['filename'];
 
@@ -124,22 +130,20 @@ function fbrowser_content(App $a) {
                                        '$baseurl'  => System::baseUrl(),
                                        '$path'     => [ [ "", L10n::t("Files")] ],
                                        '$folders'  => false,
-                                       '$files'    =>$files,
+                                       '$files'    => $files,
                                        '$cancel'   => L10n::t('Cancel'),
                                        '$nickname' => $a->user['nickname'],
+                                       '$upload'       => L10n::t('Upload')
                                ]);
-
                        }
 
                        break;
        }
 
-       if (x($_GET,'mode')) {
+       if (x($_GET, 'mode')) {
                return $o;
        } else {
                echo $o;
                killme();
        }
-
-
 }

diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl
index 2c683f784a65d60c2433518a2c625d108ac7b497..105e0c7c47f904a11113d60ebbcd2e48a73b52bd 100644 (file)
--- a/view/templates/filebrowser.tpl
+++ b/view/templates/filebrowser.tpl
@@ -40,7 +40,7 @@
        </div>
 
        <div class="upload">
-               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
+               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{$upload}}</button>
        </div>
 </div>
 

diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl
index 48ed01a01f9d1f3d12c0d660c4e59d52fde1ed0a..3fde6a52021b07b45b9137844d8e03e98bdf7756 100644 (file)
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@ -58,7 +58,7 @@
                </div>
 
                <div class="upload">
-                       <button id="upload-{{$type}}">{{"Upload"|t}}</button>
+                       <button id="upload-{{$type}}">{{$upload}}</button>
                </div>
        </div>