Move strings to translation files (#598)

Closes #596
picotorrent · Apr 23, 2018 · 85cc1eb · 85cc1eb
1 parent 68e95ab
commit 85cc1eb
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 15 deletions.
diff --git a/lang/1033.json b/lang/1033.json
@@ -228,6 +228,11 @@
         "skip_add_torrent_dialog": "Skip 'Add torrent' dialog",
         "start_torrent": "Start torrent",
         "auto_managed": "Auto managed",
-        "copy": "Copy"
+        "copy": "Copy",
+        "d_of_d": "%d (of %d)",
+        "dht_disabled": "DHT: disabled",
+        "dht_i64d_nodes": "DHT: %I64d node(s)",
+        "i64d_torrents": "%I64d torrent(s)",
+        "dl_s_ul_s": "DL: %s/s, UL: %s/s"
     }
 }
diff --git a/src/picotorrent/mainframe.cpp b/src/picotorrent/mainframe.cpp
@@ -64,7 +64,7 @@ MainFrame::MainFrame(std::shared_ptr<pt::Configuration> config,
     m_env(env),
     m_srv(std::make_shared<ipc::Server>(this)),
     m_splitter(new wxSplitterWindow(this, wxID_ANY)),
-    m_status(new StatusBar(this)),
+    m_status(new StatusBar(this, translator)),
     m_torrentListViewModel(new TorrentListViewModel(translator)),
     m_trans(translator),
     m_updater(std::make_shared<ApplicationUpdater>(this, config, translator))

diff --git a/src/picotorrent/mainmenu.cpp b/src/picotorrent/mainmenu.cpp
@@ -57,7 +57,7 @@ MainMenu::MainMenu(std::shared_ptr<pt::SessionState> state,
     wxMenu* menuHelp = new wxMenu();
     menuHelp->Append(ptID_CHECK_FOR_UPDATES, i18n(m_trans, "amp_check_for_update"));
     menuHelp->AppendSeparator();
-    menuHelp->Append(wxID_ABOUT);
+    menuHelp->Append(wxID_ABOUT, i18n(m_trans, "amp_about"));
 
     Append(menuFile, i18n(m_trans, "amp_file"));
     Append(menuView, i18n(m_trans, "amp_view"));

diff --git a/src/picotorrent/overviewpage.cpp b/src/picotorrent/overviewpage.cpp
@@ -43,7 +43,8 @@ OverviewPage::OverviewPage(wxWindow* parent, wxWindowID id, std::shared_ptr<pt::
     m_name(new CopyableStaticText(this, tr)),
     m_infoHash(new CopyableStaticText(this, tr)),
     m_savePath(new CopyableStaticText(this, tr)),
-    m_pieces(new CopyableStaticText(this, tr))
+    m_pieces(new CopyableStaticText(this, tr)),
+    m_translator(tr)
 {
     wxFlexGridSizer* sz = new wxFlexGridSizer(4, 10, 10);
     sz->AddGrowableCol(1);
@@ -84,14 +85,14 @@ void OverviewPage::Update(lt::torrent_status const& ts)
     m_name->SetLabel(wxString::FromUTF8(ts.name));
     m_infoHash->SetLabel(ih.str());
     m_savePath->SetLabel(savePath);
-    m_pieces->SetLabel(wxString::Format("%d (of %d)", ts.pieces.count(), ts.pieces.size()));
+    m_pieces->SetLabel(wxString::Format(i18n(m_translator, "d_of_d"), ts.pieces.count(), ts.pieces.size()));
 
     this->SendSizeEvent();
 }
 
 wxStaticText* OverviewPage::GetBoldStatic(wxString const& label)
 {
-    wxStaticText* ctrl = new wxStaticText(this, wxID_ANY, label);	
+    wxStaticText* ctrl = new wxStaticText(this, wxID_ANY, label);
     wxFont font = ctrl->GetFont();
     font.SetWeight(wxFONTWEIGHT_BOLD);
     ctrl->SetFont(font);

diff --git a/src/picotorrent/overviewpage.hpp b/src/picotorrent/overviewpage.hpp
@@ -27,6 +27,8 @@ namespace pt
     private:
         wxStaticText* GetBoldStatic(wxString const& label);
 
+        std::shared_ptr<Translator> m_translator;
+
         wxStaticText* m_name;
         wxStaticText* m_infoHash;
         wxStaticText* m_savePath;

diff --git a/src/picotorrent/statusbar.cpp b/src/picotorrent/statusbar.cpp
@@ -1,11 +1,13 @@
 #include "statusbar.hpp"
 
+#include "translator.hpp"
 #include "utils.hpp"
 
 using pt::StatusBar;
 
-StatusBar::StatusBar(wxWindow* parent)
-    : wxStatusBar(parent, wxID_ANY)
+StatusBar::StatusBar(wxWindow* parent, std::shared_ptr<pt::Translator> translator)
+    : wxStatusBar(parent, wxID_ANY),
+    m_translator(translator)
 {
     int widths[] =
     {
@@ -22,23 +24,23 @@ void StatusBar::UpdateDhtNodesCount(int64_t nodes)
 {
     if (nodes < 0)
     {
-        SetStatusText("DHT: disabled", 1);
+        SetStatusText(i18n(m_translator, "dht_disabled"), 1);
     }
     else
     {
-        SetStatusText(wxString::Format("DHT: %I64d node(s)", nodes), 1);
+        SetStatusText(wxString::Format(i18n(m_translator, "dht_i64d_nodes"), nodes), 1);
     }
 }
 
 void StatusBar::UpdateTorrentCount(int64_t torrents)
 {
-    SetStatusText(wxString::Format("%I64d torrent(s)", torrents), 0);
+    SetStatusText(wxString::Format(i18n(m_translator, "i64d_torrents"), torrents), 0);
 }
 
 void StatusBar::UpdateTransferRates(int64_t downSpeed, int64_t upSpeed)
 {
     SetStatusText(
-        wxString::Format("DL: %s/s, UL: %s/s",
+        wxString::Format(i18n(m_translator, "dl_s_ul_s"),
             Utils::ToHumanFileSize(downSpeed),
             Utils::ToHumanFileSize(upSpeed)),
         2);

diff --git a/src/picotorrent/statusbar.hpp b/src/picotorrent/statusbar.hpp
@@ -5,15 +5,22 @@
 #include <wx/wx.h>
 #endif
 
+#include <memory>
+
 namespace pt
 {
+    class Translator;
+
     class StatusBar : public wxStatusBar
     {
     public:
-        StatusBar(wxWindow* parent);
+        StatusBar(wxWindow* parent, std::shared_ptr<Translator> translator);
 
         void UpdateDhtNodesCount(int64_t nodes);
         void UpdateTorrentCount(int64_t torrents);
         void UpdateTransferRates(int64_t downSpeed, int64_t upSpeed);
+
+    private:
+        std::shared_ptr<Translator> m_translator;
     };
 }
diff --git a/src/picotorrent/torrentlistviewmodel.cpp b/src/picotorrent/torrentlistviewmodel.cpp
@@ -307,7 +307,7 @@ void TorrentListViewModel::GetValueByRow(wxVariant &variant, unsigned int row, u
         }
 
         variant = wxString::Format(
-            "%d (of %d)",
+            i18n(m_translator, "d_of_d"),
             ts.num_seeds,
             ts.list_seeds);
         break;
@@ -319,7 +319,7 @@ void TorrentListViewModel::GetValueByRow(wxVariant &variant, unsigned int row, u
         }
 
         variant = wxString::Format(
-            "%d (of %d)",
+            i18n(m_translator, "d_of_d"),
             ts.num_peers - ts.num_seeds,
             ts.list_peers - ts.list_seeds);
         break;