From 98b2ed9b280fa08fbe61856f4fbfc75e0d92807d Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 13 May 2021 13:01:20 +0200
Subject: [PATCH] (cp 3757539) Fixes #1395

Translation line added and message displayed properly.

Conflicts:
	language/fr_FR/admin.lang.php
---
 admin/themes/default/js/group_list.js        | 2 +-
 admin/themes/default/template/group_list.tpl | 1 +
 language/en_UK/admin.lang.php                | 3 ++-
 language/fr_FR/admin.lang.php                | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/themes/default/js/group_list.js b/admin/themes/default/js/group_list.js
index fbd686f2a..7d336ed89 100644
--- a/admin/themes/default/js/group_list.js
+++ b/admin/themes/default/js/group_list.js
@@ -99,7 +99,7 @@ jQuery(document).ready(function () {
           setupGroupBox(groupBox);
           updateBadge();
         } else {
-          $("#addGroupForm .groupError").html(str_name_taken);
+          $("#addGroupForm .groupError").html(str_name_not_empty);
           $("#addGroupForm .groupError").fadeIn();
           $("#addGroupForm .groupError").delay(DELAY_FEEDBACK).fadeOut();
         }
diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl
index 22be37de3..8eadb653c 100644
--- a/admin/themes/default/template/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
@@ -6,6 +6,7 @@ var str_members_default = "{'members'|@translate}"
 var str_group_created = "{'Group added'|@translate}"
 var str_renaming_done = "{'Group renamed'|@translate}"
 var str_name_taken = "{'Name is already taken'|@translate}"
+var str_name_not_empty = "{'Name field must not be empty'|@translate}"
 var str_group_deleted = '{'Group "%s" succesfully deleted'|@translate}'
 var str_groups_deleted = '{'Groups \{%s\} succesfully deleted'|@translate}'
 var str_set_default = "{'Set as group for new users'|@translate}"
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 14499014b..438b53679 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1121,4 +1121,5 @@ $lang['Refresh thumbnail'] = 'Refresh thumbnail';
 $lang['Compact View'] = 'Compact View';
 $lang['Tile View'] = 'Tile View';
 $lang['Line View'] = 'Line View';
-$lang['Add Album'] = 'Add Album';
\ No newline at end of file
+$lang['Add Album'] = 'Add Album';
+$lang['Name field must not be empty'] = 'Name field must not be empty';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 77176ab5e..ac61dfcc0 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1124,3 +1124,4 @@ $lang['Compact View'] = 'Affichage compact';
 $lang['Tile View'] = 'Affichage tuiles';
 $lang['Line View'] = 'Affichage lignes';
 $lang['Add Album'] = 'Ajouter un Album';
+$lang['Name field must not be empty'] = 'Le nom ne dois pas être vide';