From b56f9c4503050ddf959927926be6ad22281fd3d5 Mon Sep 17 00:00:00 2001
From: Vinciane <vinciane.bizet@maarch.org>
Date: Mon, 4 Mar 2019 17:48:20 +0100
Subject: [PATCH] FIX #9511 Change lang variable
---
.angulardoc.json | 4 ++++
MaarchCourrier | 1 +
cs_maarch_develop | 1 +
...mplate-administration-checkEntities-modal.component.html | 2 +-
.../template/template-administration.component.html | 6 +++---
src/frontend/lang/lang-en.ts | 6 +++---
src/frontend/lang/lang-fr.ts | 6 +++---
src/frontend/lang/lang-nl.ts | 6 +++---
test/unitTests/app/template/TemplateControllerTest.php | 6 +++---
9 files changed, 22 insertions(+), 16 deletions(-)
create mode 100644 .angulardoc.json
create mode 120000 MaarchCourrier
create mode 120000 cs_maarch_develop
diff --git a/.angulardoc.json b/.angulardoc.json
new file mode 100644
index 00000000000..cd6626264d7
--- /dev/null
+++ b/.angulardoc.json
@@ -0,0 +1,4 @@
+{
+ "repoId": "a053e6e9-56d8-4b38-8e27-a5308c01a2d9",
+ "lastSync": 0
+}
\ No newline at end of file
diff --git a/MaarchCourrier b/MaarchCourrier
new file mode 120000
index 00000000000..cad2cf80d74
--- /dev/null
+++ b/MaarchCourrier
@@ -0,0 +1 @@
+/var/www/html/MaarchCourrier/
\ No newline at end of file
diff --git a/cs_maarch_develop b/cs_maarch_develop
new file mode 120000
index 00000000000..cad2cf80d74
--- /dev/null
+++ b/cs_maarch_develop
@@ -0,0 +1 @@
+/var/www/html/MaarchCourrier/
\ No newline at end of file
diff --git a/src/frontend/app/administration/template/template-administration-checkEntities-modal.component.html b/src/frontend/app/administration/template/template-administration-checkEntities-modal.component.html
index f0749f778a1..1222593a427 100644
--- a/src/frontend/app/administration/template/template-administration-checkEntities-modal.component.html
+++ b/src/frontend/app/administration/template/template-administration-checkEntities-modal.component.html
@@ -2,7 +2,7 @@
<h2 mat-dialog-title>{{lang.templateAssociateEntities}}</h2>
<div class="modal-body">
<div class="alert alert-warning" role="alert">
- <p><b>{{lang.templateCheckEntities}}{{lang[data.template_attachment_type]}}</b></p>
+ <p><b>{{lang.templateCheckEntities}}{{lang['AR'+data.template_attachment_type]}}</b></p>
</div>
<mat-list>
<mat-list-item *ngFor="let entity of data.entitiesList">
diff --git a/src/frontend/app/administration/template/template-administration.component.html b/src/frontend/app/administration/template/template-administration.component.html
index dc7dc0f3cb3..6faad067ca0 100755
--- a/src/frontend/app/administration/template/template-administration.component.html
+++ b/src/frontend/app/administration/template/template-administration.component.html
@@ -74,9 +74,9 @@
<mat-form-field>
<mat-select [disabled]="!creationMode" id="template_attachment_type" name="template_attachment_type" title="{{lang.acknowledgementReceiptType}}" placeholder="{{lang.acknowledgementReceiptType}}"
[(ngModel)]="template.template_attachment_type" required>
- <mat-option value="simple">{{lang.ar_simple}}</mat-option>
- <mat-option value="sva">{{lang.ar_sva}}</mat-option>
- <mat-option value="svr">{{lang.ar_svr}}</mat-option>
+ <mat-option value="simple">{{lang.ARsimple}}</mat-option>
+ <mat-option value="sva">{{lang.ARsva}}</mat-option>
+ <mat-option value="svr">{{lang.ARsvr}}</mat-option>
</mat-select>
</mat-form-field>
</div>
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index ebc0a6ee6e6..f118423a249 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -36,9 +36,9 @@ export const LANG_EN = {
"april" : "April",
"aprilShort" : "Apr.",
"acknowledgementReceipt" : "Acknowledgement of receipt",
- 'ar_simple' : 'AR simple',
- 'ar_sva' : 'AR SVA',
- 'ar_svr' : 'AR SVR',
+ 'ARsimple' : 'AR simple',
+ 'ARsva' : 'AR SVA',
+ 'ARsvr' : 'AR SVR',
"archivalAgency" : "Archival agency",
"archivalAgreement" : "Archival agreement",
"arrivalDate" : "Arrival date",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 8c843466d99..637570461c4 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -43,9 +43,9 @@ export const LANG_FR = {
"april" : "Avril",
"aprilShort" : "Avr.",
"acknowledgementReceipt" : "Accusé de réception",
- 'ar_simple' : 'AR simple',
- 'ar_sva' : 'AR SVA',
- 'ar_svr' : 'AR SVR',
+ 'ARsimple' : 'AR simple',
+ 'ARsva' : 'AR SVA',
+ 'ARsvr' : 'AR SVR',
"archival" : "Archivage",
"archivalAgency" : "Convention d'archivage",
"archivalAgreement" : "Service d'archive",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index f0a7812e923..89d323a8b1c 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -877,9 +877,9 @@ export const LANG_NL = {
"addNote" : "Add note", //_TO_TRANSLATE
"makeActionOn" : "Do you want to do this action on", //_TO_TRANSLATE
"acknowledgementReceipt" : "Acknowledgement of receipt", //_TO_TRANSLATE
- 'ar_simple' : 'AR simple', //_TO_TRANSLATE
- 'ar_sva' : 'AR SVA', //_TO_TRANSLATE
- 'ar_svr' : 'AR SVR', //_TO_TRANSLATE
+ 'ARsimple' : 'AR simple', //_TO_TRANSLATE
+ 'ARsva' : 'AR SVA', //_TO_TRANSLATE
+ 'ARsvr' : 'AR SVR', //_TO_TRANSLATE
"tooMuchDatas" : "Too much datas to export", //_TO_TRANSLATE
"warnTooMuchSelect" : "only 500 elements can be processed with an action", //_TO_TRANSLATE
"elements" : "element(s)", //_TO_TRANSLATE
diff --git a/test/unitTests/app/template/TemplateControllerTest.php b/test/unitTests/app/template/TemplateControllerTest.php
index 65eff6bb826..5a60ed6edb7 100755
--- a/test/unitTests/app/template/TemplateControllerTest.php
+++ b/test/unitTests/app/template/TemplateControllerTest.php
@@ -90,7 +90,7 @@ class TemplateControllerTest extends TestCase
'template_label' => 'TEST TEMPLATE AR',
'template_comment' => 'DESCRIPTION OF THIS TEMPLATE',
'template_target' => 'acknowledgementReceipt',
- 'template_attachment_type' => 'ar_simple',
+ 'template_attachment_type' => 'ARsimple',
'template_type' => 'OFFICE_HTML',
'template_content' => 'Content of this template',
'template_datasource' => 'letterbox_attachment',
@@ -112,7 +112,7 @@ class TemplateControllerTest extends TestCase
'template_label' => 'TEST TEMPLATE AR FAIL',
'template_comment' => 'DESCRIPTION OF THIS TEMPLATE',
'template_target' => 'acknowledgementReceipt',
- 'template_attachment_type' => 'ar_simple',
+ 'template_attachment_type' => 'ARsimple',
'template_type' => 'OFFICE_HTML',
'template_content' => 'Content of this template',
'template_datasource' => 'letterbox_attachment',
@@ -132,7 +132,7 @@ class TemplateControllerTest extends TestCase
'template_label' => 'TEST TEMPLATE AR FAIL',
'template_comment' => 'DESCRIPTION OF THIS TEMPLATE',
'template_target' => 'acknowledgementReceipt',
- 'template_attachment_type' => 'ar_simple',
+ 'template_attachment_type' => 'ARsimple',
'template_type' => 'OFFICE_HTML',
'template_content' => '',
'template_datasource' => 'letterbox_attachment',
--
GitLab