From 32a7516927685b586d64ffb6591c20267ec55841 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 1 Dec 2016 22:23:41 -0500
Subject: [PATCH] [fix] Implementing comments from opi

---
 src/js/yunohost/controllers/domains.js |  5 ++++-
 src/locales/en.json                    |  3 +++
 src/views/domain/domain_info.ms        | 11 +++++------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/js/yunohost/controllers/domains.js b/src/js/yunohost/controllers/domains.js
index ee73b3a4..e201ef00 100644
--- a/src/js/yunohost/controllers/domains.js
+++ b/src/js/yunohost/controllers/domains.js
@@ -83,6 +83,10 @@
         c.api('/domains/main', function(dataMain) {
             c.api('/apps?installed', function(data) { // http://api.yunohost.org/#!/app/app_list_get_8
 
+                // FIXME - This dirty trick (along with the previous API call
+                //  for apps installed) should be removed once letsencrypt_ynh
+                //  is not used by many people anymore. Probably around 07/2017
+                //  or end of 2017...
                 enable_cert_management_ = true;
                 $.each(data['apps'], function(k, v) {
                     if (v.id == "letsencrypt")
@@ -98,7 +102,6 @@
                     url: "https://"+c.params['domain'],
                     enable_cert_management: enable_cert_management_
                 };
-                console.log(domain);
                 c.view('domain/domain_info', domain);
             });
         }, 'PUT');
diff --git a/src/locales/en.json b/src/locales/en.json
index c080f459..43e2b0fa 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -302,6 +302,9 @@
     "certificate_alert_good": "Okay, certificate looks good !",
     "certificate_alert_great": "Great ! You're using a valid Let's Encrypt certificate !",
     "certificate_alert_unknown": "Unknown status",
+    "certificate_manage" : "Manage SSL certificate",
+    "certificate_old_letsencrypt_app_conflict" : "The 'letsencrypt' app is currently installed and conflicts with this feature. Please uninstall it first to use the new certificate management interface.",
+    "ssl_certificate" : "SSL certificate",
     "confirm_cert_install_LE": "Are you sure you want to install a Let's Encrypt certificate for this domain.",
     "confirm_cert_regen_selfsigned": "Are you sure you want to regenerate a self-signed certificate for this domain ?",
     "confirm_cert_manual_renew_LE": "Are you sure you want to manually renew the Let's Encrypt certificate for this domain now ?",
diff --git a/src/views/domain/domain_info.ms b/src/views/domain/domain_info.ms
index 80c7bb01..e830ea3b 100644
--- a/src/views/domain/domain_info.ms
+++ b/src/views/domain/domain_info.ms
@@ -57,15 +57,14 @@
         </div>
         <hr>
         <div class="container">
-            <p>Gérer le certificat</p>
+            <p>{{t 'certificate_manage'}}</p>
             {{#unless enable_cert_management}}
-            <p><span class="fa-fw fa-exclamation-circle"></span> The 'letsencrypt'
-            app is currently installed and conflicts with this feature. Please
-            uninstall it first to use the new certificate management
-            interface.</p>
+            <p><span class="fa-fw fa-exclamation-circle"></span>
+            {{t 'certificate_old_letsencrypt_app_conflict'}}
+            </p>
             {{/unless}}
             <a href="#/domains/{{name}}/cert-management" class="btn btn-default slide {{#unless enable_cert_management}}disabled{{/unless}}">
-                Certificat SSL <span class="fa-fw fa-lock"></span>
+                {{t 'ssl_certificate'}} <span class="fa-fw fa-lock"></span>
             </a>
         </div>
         <hr>