rawurlencode thumbnails URL + fix pluralizer for L5.4

dvlpp · Mar 21, 2017 · 0b3dae7 · 0b3dae7
1 parent de5c64a
commit 0b3dae7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/resources/lang/en/ui.php b/resources/lang/en/ui.php
@@ -7,7 +7,7 @@
     'login_submitBtn' => 'Connect',
     'login_passwordForgotten' => 'Forgot password?',
 
-    'list_title' => '{0} No element.|{1} 1 element|[2,Inf] :count elements',
+    'list_title' => '{0} No element.|{1} 1 element|[2,*] :count elements',
     'list_pagination' => '– page :current of :total',
     'list_newBtn' => 'Create new',
     'list_reorderBtn' => 'Reorder',

diff --git a/resources/lang/fr/ui.php b/resources/lang/fr/ui.php
@@ -7,7 +7,7 @@
     'login_submitBtn' => 'Connexion',
     'login_passwordForgotten' => 'Mot de passe oublié ?',
 
-    'list_title' => '{0} Aucun élément.|{1} 1 élément|[2,Inf] :count éléments',
+    'list_title' => '{0} Aucun élément.|{1} 1 élément|[2,*] :count éléments',
     'list_pagination' => '– page :current sur :total',
     'list_newBtn' => 'Création',
     'list_reorderBtn' => 'Réorganiser',

diff --git a/src/helpers/sharp_helper.php b/src/helpers/sharp_helper.php
@@ -85,10 +85,10 @@ function sharp_thumbnail($source, $w, $h, $params = [], $relativeFolder=null, $i
     }
 
     if(config("sharp.thumbnail_in_storage", false)) {
-        return url(urlencode("storage/$thumbnailPath/".config('sharp.upload_storage_base_path')."/$thumbName"));
+        return url("storage/$thumbnailPath/".config('sharp.upload_storage_base_path')."/".rawurlencode($thumbName));
     }
 
-    return url(urlencode("$thumbnailPath/$thumbName"));
+    return url("$thumbnailPath/".rawurlencode($thumbName));
 }
 
 /**