From ef3d059d5d41a0b888ebf2ca6bd340591dbc7c56 Mon Sep 17 00:00:00 2001
From: Sam <sam@lalop.co>
Date: Mon, 9 May 2016 19:14:00 +0300
Subject: [PATCH] translate submit button

---
 public/modules/forms/base/config/i18n/english.js            | 6 +++---
 public/modules/forms/base/config/i18n/french.js             | 3 ++-
 .../views/directiveViews/form/submit-form.client.view.html  | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/modules/forms/base/config/i18n/english.js b/public/modules/forms/base/config/i18n/english.js
index d5a9c7c1..dc83635e 100644
--- a/public/modules/forms/base/config/i18n/english.js
+++ b/public/modules/forms/base/config/i18n/english.js
@@ -21,12 +21,12 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 	LEGAL_NO_ACCEPT: 'I don’t accept',
 	DELETE: 'Delete',
 	CANCEL: 'Cancel',
-	UPLOAD_FILE: 'Upload your File'
-
+	UPLOAD_FILE: 'Upload your File',
+	SUBMIT: 'Submit'
   });
 
   $translateProvider.preferredLanguage('english')
   	.fallbackLanguage('english')
 	.useSanitizeValueStrategy('escape');
-	
+
 }]);
diff --git a/public/modules/forms/base/config/i18n/french.js b/public/modules/forms/base/config/i18n/french.js
index 3a346b8c..3eaa31c7 100644
--- a/public/modules/forms/base/config/i18n/french.js
+++ b/public/modules/forms/base/config/i18n/french.js
@@ -21,7 +21,8 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 	LEGAL_NO_ACCEPT: 'Jen n’accepte pas',
 	DELETE: 'Supprimer',
 	CANCEL: 'Réinitialiser',
-	UPLOAD_FILE: 'Envoyer des fichier'
+	UPLOAD_FILE: 'Envoyer des fichier',
+	SUBMIT: 'Enregistrer'
   });
 
 }]);
diff --git a/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html b/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
index 27558e25..a91c84fe 100755
--- a/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
+++ b/public/modules/forms/base/views/directiveViews/form/submit-form.client.view.html
@@ -63,6 +63,7 @@ ng-style="{'color':button.color}">
 
 
 <div class="row form-actions" id="submit_field"
+<<<<<<< f4590ec7d744fde5b543eba3d589cd5727222143
 	ng-class="{activeField: selected._id == 'submit_field' }"
 	ng-style="{ 'background-color':myform.design.colors.buttonColor}"
 	style="border-top: 1px solid #ddd; margin-right: -13%; margin-left: -13%; margin-top: 30vh; height: 100vh">
@@ -81,7 +82,7 @@ ng-style="{'color':button.color}">
 		ng-style="{'background-color':myform.design.colors.buttonColor, 'color':myform.design.colors.buttonTextColor}"
 		style="font-size: 1.6em; margin-left: 1em; margin-top: 1em;">
 
-		Submit
+		{{ 'SUBMIT' | translate }}
 	</button>
 
 	<button ng-if="forms.myForm.$invalid"