From 38a31cbd28ed3a77ef749c671ce1526153100604 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Tue, 22 Nov 2016 05:25:08 +0100
Subject: [PATCH] Fix missing key language in dictionary email models
---
htdocs/admin/dict.php | 14 ++++++--------
htdocs/langs/en_US/admin.lang | 3 +--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 23c04b30fea..13af86a6b3a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1034,8 +1034,8 @@ if ($id)
if ($fieldlist[$field]=='nbjour') { $valuetoshow=$langs->trans("NbOfDays"); }
if ($fieldlist[$field]=='type_cdr') { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
if ($fieldlist[$field]=='decalage') { $valuetoshow=$langs->trans("Offset"); }
- if ($fieldlist[$field]=='width') { $valuetoshow=$langs->trans("Width"); }
- if ($fieldlist[$field]=='height') { $valuetoshow=$langs->trans("Height"); }
+ if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
+ if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $valuetoshow=''; }
if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
@@ -1061,8 +1061,7 @@ if ($id)
if ($fieldlist[$field]=='font_size') { $valuetoshow=$langs->trans("FontSize"); }
if ($fieldlist[$field]=='custom_x') { $valuetoshow=$langs->trans("CustomX"); }
if ($fieldlist[$field]=='custom_y') { $valuetoshow=$langs->trans("CustomY"); }
- if ($fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("NX"); }
- if ($fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("NY"); }
+ if ($fieldlist[$field]=='content') { $valuetoshow=$langs->trans("Content"); }
if ($id == 2) // Special cas for state page
{
@@ -1222,8 +1221,8 @@ if ($id)
if ($fieldlist[$field]=='nbjour') { $valuetoshow=$langs->trans("NbOfDays"); }
if ($fieldlist[$field]=='type_cdr') { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
if ($fieldlist[$field]=='decalage') { $valuetoshow=$langs->trans("Offset"); }
- if ($fieldlist[$field]=='width') { $valuetoshow=$langs->trans("Width"); }
- if ($fieldlist[$field]=='height') { $valuetoshow=$langs->trans("Height"); }
+ if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
+ if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
@@ -1249,8 +1248,7 @@ if ($id)
if ($fieldlist[$field]=='font_size') { $valuetoshow=$langs->trans("FontSize"); }
if ($fieldlist[$field]=='custom_x') { $valuetoshow=$langs->trans("CustomX"); }
if ($fieldlist[$field]=='custom_y') { $valuetoshow=$langs->trans("CustomY"); }
- if ($fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("NX"); }
- if ($fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("NY"); }
+ if ($fieldlist[$field]=='content') { $valuetoshow=$langs->trans("Content"); }
// Affiche nom du champ
if ($showfield)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 76cfde9d0a4..c529c8e19a7 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -230,8 +230,7 @@ Orientation=Orientation
SpaceX=Space X
SpaceY=Space Y
FontSize=Font size
-NX=N X
-NY= N Y
+Content=Content
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