From 96280e4e4a4e504bef00ad3286ef5520b8624339 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Mon, 14 Apr 2003 20:56:14 +0000 Subject: [PATCH] 2003-04-14 Christian Stimming * src/import-export/hbci/hbci-interaction.c: Fix some user messages where chip cards were confused with key files. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@8230 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 5 + src/import-export/hbci/hbci-interaction.c | 119 +++++++++++++++++----- 2 files changed, 96 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81a0f246b8..a0bb8ef3b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-14 Christian Stimming + + * src/import-export/hbci/hbci-interaction.c: Fix some user + messages where chip cards were confused with key files. + 2003-04-12 Herbert Thoma * src/backend/file/sixtp-dom-parsers.c diff --git a/src/import-export/hbci/hbci-interaction.c b/src/import-export/hbci/hbci-interaction.c index ab3afeb205..c92ea2a5b6 100644 --- a/src/import-export/hbci/hbci-interaction.c +++ b/src/import-export/hbci/hbci-interaction.c @@ -281,7 +281,7 @@ static int msgInputPin(const HBCI_User *user, static int msgInsertMediumOrAbort(const HBCI_User *user, - MediumType t, + MediumType mtype, void *user_data) { GNCInteractor *data = user_data; @@ -296,21 +296,51 @@ static int msgInsertMediumOrAbort(const HBCI_User *user, (HBCI_User_userId (user) ? HBCI_User_userId (user) : _("Unknown"))); b = HBCI_User_bank (user); - if (b != NULL) - /* xgettext:c-format */ - msgstr = g_strdup_printf ( _("Please insert chip card for \n" - "user '%s' at bank '%s'."), - username, bank_to_str (b)); - else - /* xgettext:c-format */ - msgstr = g_strdup_printf ( _("Please insert chip card for \n" - "user '%s' at unknown bank."), - username); + switch (mtype) + { + case MediumRDHFile: + case MediumRDHFileOld: + if (b != NULL) + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("Please make sure the key file for \n" + "user '%s' at bank '%s' can be accessed."), + username, bank_to_str (b)); + else + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("Please make sure the key file for \n" + "user '%s' at unknown bank can be accessed."), + username); + break; + case MediumDDVCard: + case MediumRDHCard: + default: + if (b != NULL) + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("Please insert chip card for \n" + "user '%s' at bank '%s'."), + username, bank_to_str (b)); + else + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("Please insert chip card for \n" + "user '%s' at unknown bank."), + username); + } } else - msgstr = g_strdup ( _("Please insert chip card for \n" - "unknown user at unknown bank.")); - + switch (mtype) + { + case MediumRDHFile: + case MediumRDHFileOld: + msgstr = g_strdup ( _("Please make sure the key file for \n" + "unknown user at unknown bank can be accessed.")); + break; + case MediumDDVCard: + case MediumRDHCard: + default: + msgstr = g_strdup ( _("Please insert chip card for \n" + "unknown user at unknown bank.")); + } + retval = gnc_ok_cancel_dialog_parented (data->parent, GNC_VERIFY_OK, msgstr); @@ -321,7 +351,7 @@ static int msgInsertMediumOrAbort(const HBCI_User *user, static int msgInsertCorrectMediumOrAbort(const HBCI_User *user, - MediumType t, + MediumType mtype, void *user_data) { GNCInteractor *data = user_data; @@ -336,21 +366,54 @@ static int msgInsertCorrectMediumOrAbort(const HBCI_User *user, (HBCI_User_userId (user) ? HBCI_User_userId (user) : _("Unknown"))); b = HBCI_User_bank (user); - if (b != NULL) - /* xgettext:c-format */ - msgstr = g_strdup_printf ( _("Please insert the correct chip card for \n" - "user '%s' at bank '%s'."), - username, bank_to_str (b)); - else - /* xgettext:c-format */ - msgstr = g_strdup_printf ( _("Please insert the correct chip card for \n" - "user '%s' at unknown bank."), - username); + switch (mtype) + { + case MediumRDHFile: + case MediumRDHFileOld: + if (b != NULL) + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("The key file does not seem to be the correct \n" + "file for user '%s' at bank '%s'. Please make \n" + "sure the correct key file can be accessed."), + username, bank_to_str (b)); + else + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("The key file does not seem to be the correct \n" + "file for user '%s' at unknown bank. Please make \n" + "sure the correct key file can be accessed."), + username); + break; + case MediumDDVCard: + case MediumRDHCard: + default: + if (b != NULL) + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("Please insert the correct chip card for \n" + "user '%s' at bank '%s'."), + username, bank_to_str (b)); + else + /* xgettext:c-format */ + msgstr = g_strdup_printf ( _("Please insert the correct chip card for \n" + "user '%s' at unknown bank."), + username); + } } else - msgstr = g_strdup ( _("Please insert the correct chip card for \n" - "unknown user at unknown bank.")); - + switch (mtype) + { + case MediumRDHFile: + case MediumRDHFileOld: + msgstr = g_strdup ( _("The key file does not seem to be the correct \n" + "file for unknown user at unknown bank. Please make \n" + "sure the correct key file can be accessed.")); + break; + case MediumDDVCard: + case MediumRDHCard: + default: + msgstr = g_strdup ( _("Please insert the correct chip card for \n" + "unknown user at unknown bank.")); + } + retval = gnc_ok_cancel_dialog_parented (data->parent, GNC_VERIFY_OK, msgstr);