From 23d3ce2edff924e7ae5933c5fa7ca4615feee668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 2 Jul 2024 15:58:15 +0200
Subject: [PATCH] Merge edit and translate button for HTML widget

Closes #13383
---
 sao/src/view/form.js                           | 18 ++++++++----------
 .../gui/window/view_form/view/form_gtk/url.py  | 12 ++++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/sao/src/view/form.js b/sao/src/view/form.js
index 7c1396e0d7..156048b3ec 100644
--- a/sao/src/view/form.js
+++ b/sao/src/view/form.js
@@ -4853,15 +4853,9 @@ function eval_pyson(value){
                 'rel': 'noreferrer noopener',
             }).text(attributes.string).appendTo(this.el);
             if (attributes.translate) {
-                var button = jQuery('<button/>', {
-                    'class': 'btn btn-default btn-sm',
-                    'type': 'button',
-                    'aria-label': Sao.i18n.gettext('Translate'),
-                    'title': Sao.i18n.gettext("Translate"),
-                }).appendTo(this.el);
-                button.append(
+                this.button.prepend(
                     Sao.common.ICONFACTORY.get_icon_img('tryton-translate'));
-                button.click(this.translate.bind(this));
+                this.button.click(this.translate.bind(this));
             }
         },
         uri: function(language) {
@@ -4881,7 +4875,9 @@ function eval_pyson(value){
         },
         display: function() {
             Sao.View.Form.HTML._super.display.call(this);
-            this.button.attr('href', this.uri());
+            if (!this.attributes.translate) {
+                this.button.attr('href', this.uri());
+            }
         },
         set_readonly: function(readonly) {
             Sao.View.Form.HTML._super.set_readonly.call(this, readonly);
@@ -4897,7 +4893,9 @@ function eval_pyson(value){
             for (const language of languages) {
                 options[language.name] = language.code;
             }
-            Sao.common.selection(Sao.i18n.gettext("Choose a language"), options)
+            Sao.common.selection(
+                Sao.i18n.gettext("Choose a language"), options, false,
+                Sao.i18n.getlang())
             .done(language => {
                 window.open(this.uri(language), '_blank', 'noreferrer,noopener');
             });
diff --git a/tryton/tryton/gui/window/view_form/view/form_gtk/url.py b/tryton/tryton/gui/window/view_form/view/form_gtk/url.py
index aa40e3c154..2d5a2b2d6f 100644
--- a/tryton/tryton/gui/window/view_form/view/form_gtk/url.py
+++ b/tryton/tryton/gui/window/view_form/view/form_gtk/url.py
@@ -130,8 +130,10 @@ class HTML(Widget, TranslateMixin):
             self.button, expand=False, fill=False, padding=0)
 
         if attrs.get('translate'):
-            self.widget.pack_start(
-                self.translate_button(), expand=False, fill=False, padding=0)
+            self.button.set_image(common.IconFactory.get_image(
+                    'tryton-translate', Gtk.IconSize.SMALL_TOOLBAR))
+            self.button.set_always_show_image(True)
+            self.button.connect('clicked', self.translate)
 
     def uri(self, language=None):
         if not self.record or self.record.id < 0 or CONNECTION.url is None:
@@ -149,7 +151,8 @@ class HTML(Widget, TranslateMixin):
 
     def display(self):
         super().display()
-        self.button.set_uri(self.uri())
+        if self.attrs.get('translate'):
+            self.button.set_uri(self.uri())
 
     def _readonly_set(self, value):
         super()._readonly_set(value)
@@ -158,6 +161,7 @@ class HTML(Widget, TranslateMixin):
 
     def translate_dialog(self, languages):
         languages = {l['name']: l['code'] for l in languages}
-        result = selection(_('Choose a language'), languages)
+        result = selection(
+            _('Choose a language'), languages, default=CONFIG['client.lang'])
         if result:
             webbrowser.open(self.uri(language=result[1]), new=2)