namespacing locale, config, file_templates

1 files changed, 37 insertions, 37 deletions

diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index c02cdce..acb53a8 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -27,7 +27,7 @@
 #include "administration.hpp"
 #include "administration_writer.hpp"
 #include "locales.hpp"
-#include "import_service.hpp"
+#include "importer.hpp"
 
 static import_invoice_request* active_import_request = 0;
 
@@ -65,8 +65,8 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
 {
     if (viewing_only) ImGui::BeginDisabled();
 
-    ImGui::Text("%s: %s", localize("invoice.form.invoicenumber"), buffer->sequential_number);
-    ImGui::Text("%s: %s", localize("invoice.form.billedTo"), buffer->customer.name);
+    ImGui::Text("%s: %s", locale::get("invoice.form.invoicenumber"), buffer->sequential_number);
+    ImGui::Text("%s: %s", locale::get("invoice.form.billedTo"), buffer->customer.name);
 
     tm issued_at_date = *gmtime(&buffer->issued_at);
     if (ImGui::DatePicker("##issuedAt", issued_at_date))
@@ -74,7 +74,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
         buffer->issued_at = mktime(&issued_at_date);
     }
     ImGui::SameLine();
-    ImGui::Text(localize("invoice.form.issuedat"));
+    ImGui::Text(locale::get("invoice.form.issuedat"));
 
     tm expires_at_date = *gmtime(&buffer->expires_at);
     if (ImGui::DatePicker("##expiresAt", expires_at_date))
@@ -82,7 +82,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
         buffer->expires_at = mktime(&expires_at_date);
     }
     ImGui::SameLine();
-    ImGui::Text(localize("invoice.form.expiresat"));
+    ImGui::Text(locale::get("invoice.form.expiresat"));
 
     tm delivered_at_date = *gmtime(&buffer->delivered_at);
     if (ImGui::DatePicker("##deliveredAt", delivered_at_date))
@@ -90,23 +90,23 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
         buffer->delivered_at = mktime(&delivered_at_date);
     }
     ImGui::SameLine();
-    ImGui::Text(localize("invoice.form.deliveredat"));
+    ImGui::Text(locale::get("invoice.form.deliveredat"));
 
     ImGui::Separator();
 
-    if (ImGui::FormInvoiceFileSelector("Select file...", buffer->document.original_path)) { // @localize
+    if (ImGui::FormInvoiceFileSelector("Select file...", buffer->document.original_path)) { // @locale::get
         buffer->document.copy_path[0] = 0;
     }
 
     ImGui::Separator();
 
-    ImGui::Text(localize("invoice.form.supplier"));
+    ImGui::Text(locale::get("invoice.form.supplier"));
     draw_contact_form_ex(&buffer->supplier, false, true);
 
-    ImGui::Checkbox(localize("invoice.form.triangulation"), &buffer->is_triangulation);
+    ImGui::Checkbox(locale::get("invoice.form.triangulation"), &buffer->is_triangulation);
     if (buffer->is_triangulation) {
         ImGui::Spacing();
-        ImGui::Text(localize("invoice.form.shippinginformation"));
+        ImGui::Text(locale::get("invoice.form.shippinginformation"));
         draw_addressee_form_ex(&buffer->addressee, 0);
     }
     ImGui::Separator();
@@ -122,7 +122,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
 
     bool max_items_reached = administration_billing_item_count(buffer) >= MAX_BILLING_ITEMS;
     if (max_items_reached) ImGui::BeginDisabled();
-    if (ImGui::Button(localize(localize("invoice.form.add"))))
+    if (ImGui::Button(locale::get(locale::get("invoice.form.add"))))
     {
         billing_item item = administration_billing_item_create_empty();
         administration_billing_item_add_to_invoice(buffer, item);
@@ -130,7 +130,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
     if (max_items_reached) ImGui::EndDisabled();
 
     ImGui::SameLine();
-    ImGui::Text("| %s: ", localize("invoice.form.currency"));
+    ImGui::Text("| %s: ", locale::get("invoice.form.currency"));
     ImGui::SameLine();
     if (ImGui::FormCurrencyCombo(buffer->currency))
     {
@@ -146,7 +146,7 @@ static void ui_draw_expenses_list()
 {
     if (!administration_can_create_invoices()) {
         ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 102, 204, 255)); // blue
-        ImGui::Text(localize("ui.invoiceRequirementP1"));
+        ImGui::Text(locale::get("ui.invoiceRequirementP1"));
         ImGui::PopStyleColor();
 
         if (ImGui::IsItemHovered()) {
@@ -157,7 +157,7 @@ static void ui_draw_expenses_list()
         }
 
         ImGui::SameLine();
-        ImGui::Text(localize("ui.invoiceRequirementP2"));
+        ImGui::Text(locale::get("ui.invoiceRequirementP2"));
         return;
     }
 
@@ -172,7 +172,7 @@ static void ui_draw_expenses_list()
     if (max_page == 0) max_page = 1;
 
     // Table header controls: create, import, and pagination.
-    if (ImGui::Button(localize("form.create")))
+    if (ImGui::Button(locale::get("form.create")))
     {
         current_view_state = view_state::CREATE;
         active_invoice = administration_invoice_create_empty(); // @leak
@@ -183,7 +183,7 @@ static void ui_draw_expenses_list()
 
     char import_file_path[MAX_LEN_PATH] = {0};
     ImGui::SameLine();
-    if (ImGui::FormInvoiceFileSelector("+ Import", import_file_path)) { // @localize
+    if (ImGui::FormInvoiceFileSelector("+ Import", import_file_path)) { // @locale::get
         current_view_state = view_state::VIEW_IMPORT_REQUEST;
         active_invoice = administration_invoice_create_empty(); // @leak
         active_invoice.customer = administration_company_info_get();
@@ -200,7 +200,7 @@ static void ui_draw_expenses_list()
     ImGui::SameLine();
     bool enable_prev = current_page > 0;
     if (!enable_prev) ImGui::BeginDisabled();
-    if (ImGui::Button(localize("ui.prev")) && current_page > 0) current_page--;
+    if (ImGui::Button(locale::get("ui.prev")) && current_page > 0) current_page--;
     if (!enable_prev) ImGui::EndDisabled();
 
     ImGui::SameLine();
@@ -210,19 +210,19 @@ static void ui_draw_expenses_list()
     ImGui::SameLine();
     bool enable_next = current_page < max_page-1;
     if (!enable_next) ImGui::BeginDisabled();
-    if (ImGui::Button(localize("ui.next")) && current_page < max_page-1) current_page++;
+    if (ImGui::Button(locale::get("ui.next")) && current_page < max_page-1) current_page++;
     if (!enable_next) ImGui::EndDisabled();
 
     ImGui::Spacing();
 
     if (ImGui::BeginTable("TableInvoices", 7, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg)) {
 
-        ImGui::TableSetupColumn(localize("invoice.table.invoicenumber"), ImGuiTableColumnFlags_WidthFixed, 120);
-        ImGui::TableSetupColumn(localize("invoice.table.sender"));
-        ImGui::TableSetupColumn(localize("invoice.table.customer"));
-        ImGui::TableSetupColumn(localize("invoice.table.issuedat"));
-        ImGui::TableSetupColumn(localize("invoice.table.total"));
-        ImGui::TableSetupColumn(localize("invoice.table.status"));
+        ImGui::TableSetupColumn(locale::get("invoice.table.invoicenumber"), ImGuiTableColumnFlags_WidthFixed, 120);
+        ImGui::TableSetupColumn(locale::get("invoice.table.sender"));
+        ImGui::TableSetupColumn(locale::get("invoice.table.customer"));
+        ImGui::TableSetupColumn(locale::get("invoice.table.issuedat"));
+        ImGui::TableSetupColumn(locale::get("invoice.table.total"));
+        ImGui::TableSetupColumn(locale::get("invoice.table.status"));
         ImGui::TableSetupColumn("");
         ImGui::TableHeadersRow();
 
@@ -240,11 +240,11 @@ static void ui_draw_expenses_list()
 
             ImGui::TableSetColumnIndex(3); ImGui::Text(buf);
             ImGui::TableSetColumnIndex(4); ImGui::Text("%.2f %s", c.total, c.currency);
-            ImGui::TableSetColumnIndex(5); ImGui::Text("%s", localize(administration_invoice_get_status_string(&c)));
+            ImGui::TableSetColumnIndex(5); ImGui::Text("%s", locale::get(administration_invoice_get_status_string(&c)));
             ImGui::TableSetColumnIndex(6);
             
             char btn_name[20];
-            snprintf(btn_name, sizeof(btn_name), "%s##%d", localize("form.view"), i);
+            snprintf(btn_name, sizeof(btn_name), "%s##%d", locale::get("form.view"), i);
             if (ImGui::Button(btn_name)) {
                 active_invoice = c;
                 current_view_state = view_state::VIEW;
@@ -252,14 +252,14 @@ static void ui_draw_expenses_list()
 
             ImGui::SameLine();
 
-            snprintf(btn_name, sizeof(btn_name), "%s##%d", localize("form.change"), i);
+            snprintf(btn_name, sizeof(btn_name), "%s##%d", locale::get("form.change"), i);
             if (ImGui::Button(btn_name)) {
                 active_invoice = administration_invoice_create_copy(&c); // We create a copy because of billing item list pointers.
                 current_view_state = view_state::EDIT;
             }
             
             ImGui::SameLine();
-            snprintf(btn_name, sizeof(btn_name), "%s##%d", localize("form.delete"), i);
+            snprintf(btn_name, sizeof(btn_name), "%s##%d", locale::get("form.delete"), i);
             if (ImGui::Button(btn_name)) {
                 selected_for_removal = c;
                 ImGui::OpenPopup("ConfirmDeletePopup");
@@ -268,15 +268,15 @@ static void ui_draw_expenses_list()
 
         // Confirmation popup before contact is deleted definitively.
         if (ImGui::BeginPopupModal("ConfirmDeletePopup", nullptr, ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoTitleBar)) {
-            ImGui::Text(localize("form.confirmDelete"));
+            ImGui::Text(locale::get("form.confirmDelete"));
             ImGui::Separator();
 
-            if (ImGui::Button(localize("form.yes"), ImVec2(120, 0))) { 
+            if (ImGui::Button(locale::get("form.yes"), ImVec2(120, 0))) { 
                 administration_invoice_remove(&selected_for_removal);
                 ImGui::CloseCurrentPopup();
             }
             ImGui::SameLine();
-            if (ImGui::Button(localize("form.no"), ImVec2(120, 0))) {
+            if (ImGui::Button(locale::get("form.no"), ImVec2(120, 0))) {
                 ImGui::CloseCurrentPopup();
             }
             ImGui::EndPopup();
@@ -289,7 +289,7 @@ static void ui_draw_expenses_list()
 
 static void ui_draw_expense_update()
 {
-    if (ImGui::Button(localize("form.back"))) {
+    if (ImGui::Button(locale::get("form.back"))) {
         current_view_state = view_state::LIST;
     }
     
@@ -299,7 +299,7 @@ static void ui_draw_expense_update()
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
-    if (ImGui::Button(localize("form.save"))) {
+    if (ImGui::Button(locale::get("form.save"))) {
         administration_invoice_update(&active_invoice);
 
         current_view_state = view_state::LIST;
@@ -313,7 +313,7 @@ static void ui_draw_expense_update()
 
 static void ui_draw_expense_create()
 {
-    if (ImGui::Button(localize("form.back"))) {
+    if (ImGui::Button(locale::get("form.back"))) {
         current_view_state = view_state::LIST;
     }
     
@@ -323,7 +323,7 @@ static void ui_draw_expense_create()
     if (!can_save) ImGui::BeginDisabled();
     
     ImGui::Spacing();
-    if (ImGui::Button(localize("form.save"))) {
+    if (ImGui::Button(locale::get("form.save"))) {
         administration_invoice_add(&active_invoice);
 
         current_view_state = view_state::LIST;
@@ -337,7 +337,7 @@ static void ui_draw_expense_create()
 
 static void ui_draw_expense_view()
 {
-    if (ImGui::Button(localize("form.back"))) {
+    if (ImGui::Button(locale::get("form.back"))) {
         current_view_state = view_state::LIST;
     }
 
@@ -356,7 +356,7 @@ static void ui_draw_import_request()
             return;
         }
         else {
-            if (ImGui::Button(localize("form.back"))) {
+            if (ImGui::Button(locale::get("form.back"))) {
                 current_view_state = view_state::LIST;
                 active_import_request = 0;
                 return;