fix(moneymanagerex#6614): fix translation of FromUTF8 strings

n-stein · Mar 27, 2024 · 6f910f0 · 6f910f0
1 parent c05536e
commit 6f910f0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/src/attachmentdialog.cpp b/src/attachmentdialog.cpp
@@ -62,7 +62,7 @@ mmAttachmentDialog::mmAttachmentDialog (wxWindow* parent, const wxString& RefTyp
     if (AttachmentsFolder == wxEmptyString)
     {
         wxString msgStr = wxString() << _("Attachment folder not defined.") << "\n"
-            << wxString::FromUTF8(_("Please set it in Tools → Options → Attachments").ToStdString()) << "\n";
+            << wxGetTranslation(wxString::FromUTF8(wxTRANSLATE("Please set it in Tools → Options → Attachments"))) << "\n";
         wxMessageBox(msgStr, _("Attachment folder not defined"), wxICON_ERROR);
     }
     else if (!wxDirExists(AttachmentsFolder))

diff --git a/src/categdialog.cpp b/src/categdialog.cpp
@@ -472,7 +472,7 @@ void mmCategDialog::showCategDialogDeleteError(bool category)
         deleteCategoryErrMsg << "\n\n" << _("Tip: Change all transactions using this Subcategory to\n"
             "another Category using the merge command:");
 
-    deleteCategoryErrMsg << "\n\n" << wxString::FromUTF8(_("Tools → Merge → Categories").ToStdString());
+    deleteCategoryErrMsg << "\n\n" << wxGetTranslation(wxString::FromUTF8(wxTRANSLATE("Tools → Merge → Categories")));
 
     wxMessageBox(deleteCategoryErrMsg, _("Category Manager: Delete Error"), wxOK | wxICON_ERROR);
 }

diff --git a/src/dbupgrade.cpp b/src/dbupgrade.cpp
@@ -118,7 +118,7 @@ bool dbUpgrade::UpgradeDB(wxSQLite3Database * db, const wxString& DbFileName)
     }
 
     wxMessageBox(wxString::Format(_("MMEX database succesfully upgraded to version %i"), ver) + "\n\n"
-        + wxString::FromUTF8(_("We suggest a database optimization under Tools → Database → Optimize").ToStdString())
+        + wxGetTranslation(wxString::FromUTF8(wxTRANSLATE("We suggest a database optimization under Tools → Database → Optimize")))
             , _("MMEX database upgrade"), wxOK | wxICON_INFORMATION);
 
     return true;

diff --git a/src/mmcheckingpanel.cpp b/src/mmcheckingpanel.cpp
@@ -677,10 +677,9 @@ void mmCheckingPanel::showTips()
 {
     if (Option::instance().getShowMoneyTips())
         m_info_panel->SetLabelText(
-            wxString::FromUTF8(
-                wxGetTranslation(
-                    TIPS[rand() % (sizeof(TIPS) / sizeof(wxString))]
-                ).ToStdString()
+            wxGetTranslation(wxString::FromUTF8(
+                TIPS[rand() % (sizeof(TIPS) / sizeof(wxString))]
+                .ToStdString())
             )
         );
     else

diff --git a/src/mmframe.cpp b/src/mmframe.cpp
@@ -2154,7 +2154,7 @@ bool mmGUIFrame::createDataStore(const wxString& fileName, const wxString& pwd,
         }
 
         wxButton* next = static_cast<wxButton*>(wizard->FindWindow(wxID_FORWARD)); //FIXME: 
-        if (next) next->SetLabel(wxString::FromUTF8(_("&Next →").ToStdString()));
+        if (next) next->SetLabel(wxGetTranslation(wxString::FromUTF8(wxTRANSLATE("&Next →"))));
 
         SetDataBaseParameters(fileName);
         /* Jump to new account creation screen */
@@ -2658,14 +2658,14 @@ void mmGUIFrame::OnNewAccount(wxCommandEvent& /*event*/)
 
         if (account->ACCOUNTTYPE == Model_Account::all_type()[Model_Account::SHARES])
         {
-            wxMessageBox(wxString::FromUTF8(_(
+            wxMessageBox(wxGetTranslation(wxString::FromUTF8(wxTRANSLATE(
                 "Share Accounts hold Share transactions\n\n"
                 "Share transactions are created within the Stock Portfolio View\n"
                 "after the selection of the Company Stock within the associated view.\n\n"
                 "These accounts only become visible after associating a Stock to the Share Account\n"
                 "Or by using the Menu View → 'Display Share Accounts'\n"
                 "Share Accounts can also hold normal transactions to regular account."
-            ).ToStdString()), _("Share Account Creation"));
+            ))), _("Share Account Creation"));
         }
 
         RefreshNavigationTree();

diff --git a/src/payeedialog.cpp b/src/payeedialog.cpp
@@ -742,7 +742,7 @@ void mmPayeeDialog::DeletePayee()
                     << "\n\n"
                     << _("Tip: Change all transactions using this Payee to another Payee"
                         " using the merge command:")
-                    << "\n\n" << wxString::FromUTF8(_("Tools → Merge → Payees").ToStdString());
+                    << "\n\n" << wxGetTranslation(wxString::FromUTF8(wxTRANSLATE("Tools → Merge → Payees")));
                 wxMessageBox(deletePayeeErrMsg, _("Payee Manager: Delete Error"), wxOK | wxICON_ERROR);
                 continue;
             }

diff --git a/src/reports/bugreport.h b/src/reports/bugreport.h
@@ -71,7 +71,7 @@ wxString mmBugReport::getHTMLText()
     wxURI req = mmex::weblink::BugReport + "/new?body=" + info + "\n<hr>" + diag;
 
     const wxString texts[] = {
-        wxString::FromUTF8(_("Use Help → Check for Updates in MMEX to get latest version, where your problem might be already fixed.").ToStdString()),
+        wxGetTranslation(wxString::FromUTF8(wxTRANSLATE("Use Help → Check for Updates in MMEX to get latest version, where your problem might be already fixed."))),
         wxString::Format(_("Search <a href='%s'>a list of known issues</a> for similar problem. If so, update existing issue instead of creating a new one.")
             ,  do_href_wrap(mmex::weblink::BugReport)),
         wxString::Format(_("As you know, <a href='%s'>a forum</a> for users is available where you can discuss problems and find solutions.") , do_href_wrap(mmex::weblink::Forum)),