[evolution-ews] Flip Application ID and Tenant ID in the OAuth2 properties

[Milan Crha <mcrha src gnome org>]

commit a2d5f8b53d2b7297fda82581c7766e776c26a2c7
Author: Milan Crha <mcrha redhat com>
Date:   Fri Oct 9 11:22:31 2020 +0200

    Flip Application ID and Tenant ID in the OAuth2 properties
    
    To match the order shown in the Azure portal and to express that
    the Application ID is more important than the Tenant ID (which
    can be left empty in some cases).
    
    This commit also changes the label of the 'Tenant' to be 'Tenant ID'.

 src/EWS/evolution/e-mail-config-ews-backend.c      | 32 +++++++++++-----------
 .../evolution/e-mail-config-m365-backend.c         | 32 +++++++++++-----------
 2 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/src/EWS/evolution/e-mail-config-ews-backend.c b/src/EWS/evolution/e-mail-config-ews-backend.c
index 5e4af390..328845ac 100644
--- a/src/EWS/evolution/e-mail-config-ews-backend.c
+++ b/src/EWS/evolution/e-mail-config-ews-backend.c
@@ -319,9 +319,7 @@ mail_config_ews_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
        g_free (markup);
 
-       /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or organization in 
an Office 365 world.
-          You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
-       widget = gtk_label_new_with_mnemonic (_("_Tenant:"));
+       widget = gtk_label_new_with_mnemonic (_("Application I_D:"));
        gtk_widget_set_margin_left (widget, 12);
        gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
        gtk_grid_attach (priv->oauth2_settings_grid, widget, 0, 1, 1, 1);
@@ -336,22 +334,20 @@ mail_config_ews_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_widget_set_hexpand (widget, TRUE);
        gtk_label_set_mnemonic_widget (label, widget);
        gtk_grid_attach (priv->oauth2_settings_grid, widget, 1, 1, 1, 1);
-       priv->oauth2_tenant_entry = widget;
+       priv->oauth2_client_id_entry = widget;
 
        e_binding_bind_property (
                priv->oauth2_override_check, "active",
                widget, "sensitive",
                G_BINDING_SYNC_CREATE);
 
-       mail_config_ews_backend_set_oauth2_tooltip (widget, OFFICE365_TENANT,
-               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in an Office 365 world. Same for 'common', it's a default URL path.
-                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
-               _("Default tenant is “common“"),
-               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in an Office 365 world.
-                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
-               g_strdup_printf (_("Default tenant is “%s”"), OFFICE365_TENANT));
+       mail_config_ews_backend_set_oauth2_tooltip (widget, OFFICE365_CLIENT_ID,
+               _("There is not set any default application ID"),
+               g_strdup_printf (_("Default application ID is “%s”"), OFFICE365_CLIENT_ID));
 
-       widget = gtk_label_new_with_mnemonic (_("Application I_D:"));
+       /* Translators: 'Tenant ID' here means a term used by Microsoft to identify a company or organization 
in an Office 365 world.
+          You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
+       widget = gtk_label_new_with_mnemonic (_("_Tenant ID:"));
        gtk_widget_set_margin_left (widget, 12);
        gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
        gtk_grid_attach (priv->oauth2_settings_grid, widget, 0, 2, 1, 1);
@@ -366,16 +362,20 @@ mail_config_ews_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_widget_set_hexpand (widget, TRUE);
        gtk_label_set_mnemonic_widget (label, widget);
        gtk_grid_attach (priv->oauth2_settings_grid, widget, 1, 2, 1, 1);
-       priv->oauth2_client_id_entry = widget;
+       priv->oauth2_tenant_entry = widget;
 
        e_binding_bind_property (
                priv->oauth2_override_check, "active",
                widget, "sensitive",
                G_BINDING_SYNC_CREATE);
 
-       mail_config_ews_backend_set_oauth2_tooltip (widget, OFFICE365_CLIENT_ID,
-               _("There is not set any default application ID"),
-               g_strdup_printf (_("Default application ID is “%s”"), OFFICE365_CLIENT_ID));
+       mail_config_ews_backend_set_oauth2_tooltip (widget, OFFICE365_TENANT,
+               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in an Office 365 world. Same for 'common', it's a default URL path.
+                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
+               _("Default tenant ID is “common“"),
+               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in an Office 365 world.
+                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
+               g_strdup_printf (_("Default tenant ID is “%s”"), OFFICE365_TENANT));
 
        container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
        gtk_grid_attach (priv->oauth2_settings_grid, container, 0, 3, 2, 1);
diff --git a/src/Microsoft365/evolution/e-mail-config-m365-backend.c 
b/src/Microsoft365/evolution/e-mail-config-m365-backend.c
index 8184617a..72bee447 100644
--- a/src/Microsoft365/evolution/e-mail-config-m365-backend.c
+++ b/src/Microsoft365/evolution/e-mail-config-m365-backend.c
@@ -207,9 +207,7 @@ mail_config_m365_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
        g_free (markup);
 
-       /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or organization in 
a Microsoft 365 world.
-          You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
-       widget = gtk_label_new_with_mnemonic (_("_Tenant:"));
+       widget = gtk_label_new_with_mnemonic (_("Application I_D:"));
        gtk_widget_set_margin_left (widget, 12);
        gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
        gtk_grid_attach (m365_backend->priv->oauth2_settings_grid, widget, 0, 1, 1, 1);
@@ -224,22 +222,20 @@ mail_config_m365_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_widget_set_hexpand (widget, TRUE);
        gtk_label_set_mnemonic_widget (label, widget);
        gtk_grid_attach (m365_backend->priv->oauth2_settings_grid, widget, 1, 1, 1, 1);
-       m365_backend->priv->oauth2_tenant_entry = widget;
+       m365_backend->priv->oauth2_client_id_entry = widget;
 
        e_binding_bind_property (
                m365_backend->priv->oauth2_override_check, "active",
                widget, "sensitive",
                G_BINDING_SYNC_CREATE);
 
-       mail_config_m365_backend_set_oauth2_tooltip (widget, MICROSOFT365_TENANT,
-               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in a Microsoft 365 world. Same for 'common', it's a default URL path.
-                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
-               _("Default tenant is “common“"),
-               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in a Microsoft 365 world.
-                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
-               g_strdup_printf (_("Default tenant is “%s”"), MICROSOFT365_TENANT));
+       mail_config_m365_backend_set_oauth2_tooltip (widget, MICROSOFT365_CLIENT_ID,
+               _("There is not set any default application ID"),
+               g_strdup_printf (_("Default application ID is “%s”"), MICROSOFT365_CLIENT_ID));
 
-       widget = gtk_label_new_with_mnemonic (_("Application I_D:"));
+       /* Translators: 'Tenant ID' here means a term used by Microsoft to identify a company or organization 
in a Microsoft 365 world.
+          You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
+       widget = gtk_label_new_with_mnemonic (_("_Tenant ID:"));
        gtk_widget_set_margin_left (widget, 12);
        gtk_misc_set_alignment (GTK_MISC (widget), 1.0, 0.5);
        gtk_grid_attach (m365_backend->priv->oauth2_settings_grid, widget, 0, 2, 1, 1);
@@ -254,16 +250,20 @@ mail_config_m365_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_widget_set_hexpand (widget, TRUE);
        gtk_label_set_mnemonic_widget (label, widget);
        gtk_grid_attach (m365_backend->priv->oauth2_settings_grid, widget, 1, 2, 1, 1);
-       m365_backend->priv->oauth2_client_id_entry = widget;
+       m365_backend->priv->oauth2_tenant_entry = widget;
 
        e_binding_bind_property (
                m365_backend->priv->oauth2_override_check, "active",
                widget, "sensitive",
                G_BINDING_SYNC_CREATE);
 
-       mail_config_m365_backend_set_oauth2_tooltip (widget, MICROSOFT365_CLIENT_ID,
-               _("There is not set any default application ID"),
-               g_strdup_printf (_("Default application ID is “%s”"), MICROSOFT365_CLIENT_ID));
+       mail_config_m365_backend_set_oauth2_tooltip (widget, MICROSOFT365_TENANT,
+               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in a Microsoft 365 world. Same for 'common', it's a default URL path.
+                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
+               _("Default tenant is “common“"),
+               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in a Microsoft 365 world.
+                  You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
+               g_strdup_printf (_("Default tenant is “%s”"), MICROSOFT365_TENANT));
 
        container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
        gtk_grid_attach (m365_backend->priv->oauth2_settings_grid, container, 0, 3, 2, 1);