From 2f1ebdc9c493628bdfe130b471e81629e1cd64a9 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Mon, 30 Apr 2012 00:17:20 +0000
Subject: feature 2626: explicit error message for PNG files + info message
 when settings saved

git-svn-id: http://piwigo.org/svn/trunk@14549 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/configuration_watermark_process.inc.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'admin/include')

diff --git a/admin/include/configuration_watermark_process.inc.php b/admin/include/configuration_watermark_process.inc.php
index 676056300..a253e9980 100644
--- a/admin/include/configuration_watermark_process.inc.php
+++ b/admin/include/configuration_watermark_process.inc.php
@@ -35,7 +35,10 @@ if (isset($_FILES['watermarkImage']) and !empty($_FILES['watermarkImage']['tmp_n
   list($width, $height, $type) = getimagesize($_FILES['watermarkImage']['tmp_name']);
   if (IMAGETYPE_PNG != $type)
   {
-    $errors['watermarkImage'] = 'PNG';
+    $errors['watermarkImage'] = sprintf(
+      l10n('Allowed file types: %s.'),
+      'PNG'
+      );
   }
   else
   {
@@ -187,6 +190,11 @@ if (count($errors) == 0)
   {
     clear_derivative_cache($changed_types);
   }
+
+  array_push(
+    $page['infos'],
+    l10n('Your configuration settings are saved')
+    );
 }
 else
 {
-- 
cgit v1.2.3