From 638563dc5d9920cf424c486d15440ca7bd875445 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 22 Nov 2016 05:54:44 +0100
Subject: [PATCH] Fix missing language key in holiday type dictionary
---
htdocs/admin/dict.php | 4 ++++
htdocs/langs/en_US/admin.lang | 2 ++
2 files changed, 6 insertions(+)
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 948e7e5d33a..4ef2a35e8a7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1063,6 +1063,7 @@ if ($id)
if ($fieldlist[$field]=='custom_y') { $valuetoshow=$langs->trans("CustomY"); }
if ($fieldlist[$field]=='content') { $valuetoshow=$langs->trans("Content"); }
if ($fieldlist[$field]=='percent') { $valuetoshow=$langs->trans("Percentage"); }
+ if ($fieldlist[$field]=='affect') { $valuetoshow=$langs->trans("Info"); }
if ($id == 2) // Special cas for state page
{
@@ -1251,6 +1252,9 @@ if ($id)
if ($fieldlist[$field]=='custom_y') { $valuetoshow=$langs->trans("CustomY"); }
if ($fieldlist[$field]=='content') { $valuetoshow=$langs->trans("Content"); }
if ($fieldlist[$field]=='percent') { $valuetoshow=$langs->trans("Percentage"); }
+ if ($fieldlist[$field]=='affect') { $valuetoshow=$langs->trans("Info"); }
+ if ($fieldlist[$field]=='delay') { $valuetoshow=$langs->trans("NoticePeriod"); }
+ if ($fieldlist[$field]=='newbymonth') { $valuetoshow=$langs->trans("NewByMonth"); }
// Affiche nom du champ
if ($showfield)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c529c8e19a7..c11f6d6c5ee 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -231,6 +231,8 @@ SpaceX=Space X
SpaceY=Space Y
FontSize=Font size
Content=Content
+NoticePeriod=Notice
+NewByMonth=New by month
Emails=E-mails
EMailsSetup=E-mails setup
EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
--
GitLab