Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 4200a46..add014c 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1452,6 +1452,8 @@ label.choose_tempfac_type = Choose Temperature Factor type
 label.interpret_tempfac_as = Interpret Temperature Factor as
 label.add_pae_matrix_file = Add PAE matrix file
 label.nothing_selected = Nothing selected
+prompt.google_analytics_title = Jalview Usage Statistics
+prompt.google_analytics = Do you want to help make Jalview better by enabling the collection of usage statistics with Google Analytics ?\n(you can enable or disable usage tracking in the preferences)
 label.working_ellipsis = Working ... 
 action.show_groups_on_matrix = Show groups on matrix
 action.show_groups_on_matrix_tooltip = When enabled, clusters defined on the matrix's associated tree or below the assigned threshold are shown as different colours on the matrix annotation row

diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index b3c6988..40b0541 100644 (file)
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -1434,3 +1434,5 @@ label.tftype_default = Default
 label.tftype_plddt = pLDDT
 label.add_pae_matrix_file = Añadir un fichero de matriz PAE
 label.nothing_selected = Nada seleccionado
+prompt.google_analytics_title = Jalview Usage Statistics
+prompt.google_analytics = Do you want to help make Jalview better by enabling the collection of usage statistics with Google Analytics ?\n(you can enable or disable usage tracking in the preferences)

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index dc97549..4a336ea 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1558,10 +1558,9 @@ public class Jalview
      * start a User Config prompt asking if we can log usage statistics.
      */
     PromptUserConfig prompter = new PromptUserConfig(Desktop.desktop,
-            "USAGESTATS", "Jalview Usage Statistics",
-            "Do you want to help make Jalview better by enabling "
-                    + "the collection of usage statistics with Google Analytics ?"
-                    + "\n\n(you can enable or disable usage tracking in the preferences)",
+            "USAGESTATS",
+            MessageManager.getString("prompt.google_analytics_title"),
+            MessageManager.getString("prompt.google_analytics"),
             new Runnable()
             {
               @Override