From 4f2c7a37635e8a7c4b74402a9ff2b77d7ffd1fde Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Tue, 5 Mar 2019 17:14:34 +0100 Subject: [PATCH] [build] Update the i18n processing to fit the out-of-tree build --- .gitignore | 4 --- apps/Makefile | 27 ++++++++++++++----- apps/calculation/app.cpp | 2 +- apps/code/app.cpp | 2 +- apps/code/menu_controller.cpp | 2 +- apps/code/script_parameter_controller.h | 2 +- apps/empty_battery_window.cpp | 2 +- apps/exam_pop_up_controller.cpp | 2 +- apps/global_preferences.h | 2 +- apps/graph/app.cpp | 2 +- apps/graph/graph/banner_view.cpp | 2 +- .../graph/calculation_parameter_controller.h | 2 +- .../graph/curve_parameter_controller.cpp | 2 +- apps/graph/list/storage_list_controller.cpp | 2 +- apps/hardware_test/pop_up_controller.cpp | 2 +- apps/home/app.cpp | 2 +- apps/i18n.py | 2 +- apps/on_boarding/pop_up_controller.h | 2 +- apps/probability/app.cpp | 2 +- apps/probability/calculation_cell.cpp | 2 +- apps/probability/law/law.h | 2 +- apps/regression/app.cpp | 2 +- .../initialisation_parameter_controller.h | 2 +- apps/regression/model/model.h | 2 +- apps/regression/regression_controller.h | 2 +- apps/settings/app.cpp | 2 +- apps/settings/main_controller.cpp | 2 +- apps/shared/expression_field_delegate_app.cpp | 2 +- .../shared/expression_model_list_controller.h | 2 +- apps/shared/function_list_controller.h | 2 +- .../initialisation_parameter_controller.h | 2 +- apps/shared/language_controller.cpp | 2 +- apps/shared/language_controller.h | 2 +- apps/shared/list_parameter_controller.h | 2 +- ...ble_exact_approximate_expressions_view.cpp | 2 +- ...storage_expression_model_list_controller.h | 2 +- .../shared/storage_function_list_controller.h | 2 +- .../storage_list_parameter_controller.h | 2 +- apps/shared/storage_values_controller.h | 2 +- ...age_values_function_parameter_controller.h | 2 +- apps/shared/store_parameter_controller.h | 2 +- apps/shared/text_field_delegate_app.h | 2 +- apps/shared/values_controller.h | 2 +- .../values_function_parameter_controller.h | 2 +- apps/shared/zoom_parameter_controller.h | 2 +- apps/shift_alpha_lock_view.h | 2 +- apps/solver/app.cpp | 2 +- .../equation_models_parameter_controller.cpp | 2 +- apps/solver/interval_controller.cpp | 2 +- apps/solver/list_controller.h | 2 +- apps/solver/solutions_controller.h | 2 +- apps/statistics/app.cpp | 2 +- apps/statistics/box_banner_view.h | 2 +- apps/statistics/histogram_banner_view.h | 2 +- .../multiple_data_view_controller.cpp | 2 +- apps/title_bar_view.h | 2 +- apps/usb/usb_connected_controller.cpp | 2 +- apps/variable_box_controller.h | 2 +- apps/variable_box_empty_controller.cpp | 2 +- 59 files changed, 78 insertions(+), 67 deletions(-) diff --git a/.gitignore b/.gitignore index 36f753c92..2e261bfd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -# No i18n headers -apps/i18n.h -apps/i18n.cpp - # Quiz output quiz/src/symbols.c diff --git a/apps/Makefile b/apps/Makefile index 31ef222b2..6c0d0a4cf 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -43,6 +43,12 @@ epsilon_app_names = '$(foreach i,${EPSILON_APPS},"$(i)", )' $(call object_for,apps/apps_container_storage.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) + +# I18n file generation + +# The header is refered to as so make sure it's findable this way +SFLAGS += -I$(OUTPUT_DIRECTORY) + i18n_files += $(addprefix apps/language_,$(addsuffix .universal.i18n, $(EPSILON_I18N))) i18n_files += $(addprefix apps/,\ shared.de.i18n\ @@ -63,14 +69,23 @@ i18n_files += $(addprefix apps/,\ variables.pt.i18n\ ) -apps/i18n.h: apps/i18n.cpp -apps/i18n.cpp: $(i18n_files) - @echo "I18N $@" - $(Q) $(PYTHON) apps/i18n.py --header $(subst .cpp,.h,$@) --implementation $@ --locales $(EPSILON_I18N) --files $^ +$(eval $(call rule_for, \ + I18N, \ + apps/i18n.cpp, \ + $(i18n_files), \ + $$(PYTHON) apps/i18n.py --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --files $$^ \ +)) -#$(app_objs): apps/i18n.h +# Make sure apps/i18n.o is built +# The extension added to app_src doesn't really matter since it'll be processed +# by the object_for function. +app_src += apps/i18n.py -products += apps/i18n.h apps/i18n.cpp +$(OUTPUT_DIRECTORY)/apps/i18n.h: $(OUTPUT_DIRECTORY)/apps/i18n.cpp + +$(call object_for,$(app_src)): $(OUTPUT_DIRECTORY)/apps/i18n.h + +# Handle PNG files $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png)) diff --git a/apps/calculation/app.cpp b/apps/calculation/app.cpp index 5be4fa94f..44c2a938e 100644 --- a/apps/calculation/app.cpp +++ b/apps/calculation/app.cpp @@ -1,7 +1,7 @@ #include "app.h" #include "../apps_container.h" #include "calculation_icon.h" -#include "../i18n.h" +#include #include using namespace Poincare; diff --git a/apps/code/app.cpp b/apps/code/app.cpp index bedd3d0f1..16dfa0150 100644 --- a/apps/code/app.cpp +++ b/apps/code/app.cpp @@ -1,7 +1,7 @@ #include "app.h" #include "../apps_container.h" #include "code_icon.h" -#include "../i18n.h" +#include #include "helpers.h" namespace Code { diff --git a/apps/code/menu_controller.cpp b/apps/code/menu_controller.cpp index 940e145fe..bf4533456 100644 --- a/apps/code/menu_controller.cpp +++ b/apps/code/menu_controller.cpp @@ -1,6 +1,6 @@ #include "menu_controller.h" #include "app.h" -#include "../i18n.h" +#include #include "../apps_container.h" #include #include diff --git a/apps/code/script_parameter_controller.h b/apps/code/script_parameter_controller.h index 5d6fc6dcf..1fef1d752 100644 --- a/apps/code/script_parameter_controller.h +++ b/apps/code/script_parameter_controller.h @@ -2,7 +2,7 @@ #define CODE_SCRIPT_PARAMETER_CONTROLLER_H #include -#include "../i18n.h" +#include #include "script_store.h" namespace Code { diff --git a/apps/empty_battery_window.cpp b/apps/empty_battery_window.cpp index bae9b0f00..b0e58e2dd 100644 --- a/apps/empty_battery_window.cpp +++ b/apps/empty_battery_window.cpp @@ -1,6 +1,6 @@ #include "empty_battery_window.h" #include "global_preferences.h" -#include "i18n.h" +#include extern "C" { #include } diff --git a/apps/exam_pop_up_controller.cpp b/apps/exam_pop_up_controller.cpp index 915fcf547..b72bca2b5 100644 --- a/apps/exam_pop_up_controller.cpp +++ b/apps/exam_pop_up_controller.cpp @@ -1,6 +1,6 @@ #include "exam_pop_up_controller.h" #include "apps_container.h" -#include "i18n.h" +#include #include "global_preferences.h" #include diff --git a/apps/global_preferences.h b/apps/global_preferences.h index 07bbd5320..24ff19581 100644 --- a/apps/global_preferences.h +++ b/apps/global_preferences.h @@ -1,7 +1,7 @@ #ifndef APPS_GLOBAL_PREFERENCES_H #define APPS_GLOBAL_PREFERENCES_H -#include "i18n.h" +#include class GlobalPreferences { public: diff --git a/apps/graph/app.cpp b/apps/graph/app.cpp index 82ffd6d16..c150b7f97 100644 --- a/apps/graph/app.cpp +++ b/apps/graph/app.cpp @@ -1,7 +1,7 @@ #include "app.h" #include "../apps_container.h" #include "graph_icon.h" -#include "../i18n.h" +#include using namespace Poincare; using namespace Shared; diff --git a/apps/graph/graph/banner_view.cpp b/apps/graph/graph/banner_view.cpp index aebd501d1..0ce02d0b2 100644 --- a/apps/graph/graph/banner_view.cpp +++ b/apps/graph/graph/banner_view.cpp @@ -1,5 +1,5 @@ #include "banner_view.h" -#include "../../i18n.h" +#include namespace Graph { diff --git a/apps/graph/graph/calculation_parameter_controller.h b/apps/graph/graph/calculation_parameter_controller.h index a875c759e..9c483122a 100644 --- a/apps/graph/graph/calculation_parameter_controller.h +++ b/apps/graph/graph/calculation_parameter_controller.h @@ -10,7 +10,7 @@ #include "root_graph_controller.h" #include "graph_view.h" #include "banner_view.h" -#include "../../i18n.h" +#include namespace Graph { diff --git a/apps/graph/graph/curve_parameter_controller.cpp b/apps/graph/graph/curve_parameter_controller.cpp index e5e9da038..2361724e5 100644 --- a/apps/graph/graph/curve_parameter_controller.cpp +++ b/apps/graph/graph/curve_parameter_controller.cpp @@ -1,6 +1,6 @@ #include "curve_parameter_controller.h" #include "graph_controller.h" -#include "../../i18n.h" +#include #include using namespace Shared; diff --git a/apps/graph/list/storage_list_controller.cpp b/apps/graph/list/storage_list_controller.cpp index 3f560440d..aee95cac7 100644 --- a/apps/graph/list/storage_list_controller.cpp +++ b/apps/graph/list/storage_list_controller.cpp @@ -1,6 +1,6 @@ #include "storage_list_controller.h" #include "../app.h" -#include "../../i18n.h" +#include #include #include #include diff --git a/apps/hardware_test/pop_up_controller.cpp b/apps/hardware_test/pop_up_controller.cpp index 60b385232..791846dcf 100644 --- a/apps/hardware_test/pop_up_controller.cpp +++ b/apps/hardware_test/pop_up_controller.cpp @@ -1,5 +1,5 @@ #include "pop_up_controller.h" -#include "../i18n.h" +#include #include "../apps_container.h" #include diff --git a/apps/home/app.cpp b/apps/home/app.cpp index 6404f410a..b7fa2ff0b 100644 --- a/apps/home/app.cpp +++ b/apps/home/app.cpp @@ -1,5 +1,5 @@ #include "app.h" -#include "../i18n.h" +#include #include "../apps_container.h" extern "C" { diff --git a/apps/i18n.py b/apps/i18n.py index f83321a01..93ec034c9 100644 --- a/apps/i18n.py +++ b/apps/i18n.py @@ -116,7 +116,7 @@ def print_header(data, path, locales): def print_implementation(data, path, locales): f = open(path, 'w') f.write("#include \"i18n.h\"\n") - f.write("#include \"global_preferences.h\"\n") + f.write("#include \n") f.write("#include \n\n"); f.write("namespace I18n {\n\n") diff --git a/apps/on_boarding/pop_up_controller.h b/apps/on_boarding/pop_up_controller.h index 52d26b398..38eac9a73 100644 --- a/apps/on_boarding/pop_up_controller.h +++ b/apps/on_boarding/pop_up_controller.h @@ -2,7 +2,7 @@ #define ON_BOARDING_POP_UP_CONTROLLER_H #include -#include "../i18n.h" +#include #include "../shared/message_view.h" #include "../shared/ok_view.h" diff --git a/apps/probability/app.cpp b/apps/probability/app.cpp index fcc3cbef1..ae2e2f693 100644 --- a/apps/probability/app.cpp +++ b/apps/probability/app.cpp @@ -1,5 +1,5 @@ #include "app.h" -#include "../i18n.h" +#include #include "probability_icon.h" #include diff --git a/apps/probability/calculation_cell.cpp b/apps/probability/calculation_cell.cpp index 0caf55d1d..9b18129ac 100644 --- a/apps/probability/calculation_cell.cpp +++ b/apps/probability/calculation_cell.cpp @@ -1,6 +1,6 @@ #include "calculation_cell.h" #include "responder_image_cell.h" -#include "../i18n.h" +#include #include namespace Probability { diff --git a/apps/probability/law/law.h b/apps/probability/law/law.h index 61df4526f..6ebd6f6f3 100644 --- a/apps/probability/law/law.h +++ b/apps/probability/law/law.h @@ -4,7 +4,7 @@ #include #include "../../constant.h" #include "../../shared/curve_view_range.h" -#include "../../i18n.h" +#include namespace Probability { diff --git a/apps/regression/app.cpp b/apps/regression/app.cpp index 88f6d288e..afd5f27e9 100644 --- a/apps/regression/app.cpp +++ b/apps/regression/app.cpp @@ -1,6 +1,6 @@ #include "app.h" #include "regression_icon.h" -#include "../i18n.h" +#include using namespace Shared; diff --git a/apps/regression/initialisation_parameter_controller.h b/apps/regression/initialisation_parameter_controller.h index efc69276e..19ba8b26a 100644 --- a/apps/regression/initialisation_parameter_controller.h +++ b/apps/regression/initialisation_parameter_controller.h @@ -3,7 +3,7 @@ #include #include "store.h" -#include "../i18n.h" +#include namespace Regression { diff --git a/apps/regression/model/model.h b/apps/regression/model/model.h index 3dd12b0c3..86e586ee5 100644 --- a/apps/regression/model/model.h +++ b/apps/regression/model/model.h @@ -2,7 +2,7 @@ #define REGRESSION_MODEL_H #include -#include "../../i18n.h" +#include #include #include #include diff --git a/apps/regression/regression_controller.h b/apps/regression/regression_controller.h index 859c7e6b1..19c462fa3 100644 --- a/apps/regression/regression_controller.h +++ b/apps/regression/regression_controller.h @@ -3,7 +3,7 @@ #include "store.h" #include -#include "../i18n.h" +#include namespace Regression { diff --git a/apps/settings/app.cpp b/apps/settings/app.cpp index 891f2552d..d096c3d90 100644 --- a/apps/settings/app.cpp +++ b/apps/settings/app.cpp @@ -1,6 +1,6 @@ #include "app.h" #include "settings_icon.h" -#include "../i18n.h" +#include namespace Settings { diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 97e03a7d3..df748f77e 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -1,6 +1,6 @@ #include "main_controller.h" #include "../global_preferences.h" -#include "../i18n.h" +#include #include using namespace Poincare; diff --git a/apps/shared/expression_field_delegate_app.cpp b/apps/shared/expression_field_delegate_app.cpp index 1549e8a30..84588f838 100644 --- a/apps/shared/expression_field_delegate_app.cpp +++ b/apps/shared/expression_field_delegate_app.cpp @@ -1,6 +1,6 @@ #include "expression_field_delegate_app.h" #include -#include "../i18n.h" +#include #include "../apps_container.h" using namespace Poincare; diff --git a/apps/shared/expression_model_list_controller.h b/apps/shared/expression_model_list_controller.h index 1b67dc22b..f8f910670 100644 --- a/apps/shared/expression_model_list_controller.h +++ b/apps/shared/expression_model_list_controller.h @@ -3,7 +3,7 @@ #include #include "expression_model_store.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/function_list_controller.h b/apps/shared/function_list_controller.h index 24d1cf760..dc74a4058 100644 --- a/apps/shared/function_list_controller.h +++ b/apps/shared/function_list_controller.h @@ -6,7 +6,7 @@ #include "function_app.h" #include "list_parameter_controller.h" #include "expression_model_list_controller.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/initialisation_parameter_controller.h b/apps/shared/initialisation_parameter_controller.h index 929040cfb..83bb27adf 100644 --- a/apps/shared/initialisation_parameter_controller.h +++ b/apps/shared/initialisation_parameter_controller.h @@ -3,7 +3,7 @@ #include #include "interactive_curve_view_range.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/language_controller.cpp b/apps/shared/language_controller.cpp index d277a28f7..682806643 100644 --- a/apps/shared/language_controller.cpp +++ b/apps/shared/language_controller.cpp @@ -1,7 +1,7 @@ #include "language_controller.h" #include "../global_preferences.h" #include "../apps_container.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/language_controller.h b/apps/shared/language_controller.h index 5dda27fac..746e68e1c 100644 --- a/apps/shared/language_controller.h +++ b/apps/shared/language_controller.h @@ -2,7 +2,7 @@ #define SHARED_LANGUAGE_CONTROLLER_H #include -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/list_parameter_controller.h b/apps/shared/list_parameter_controller.h index 8266e5496..4bde78f7f 100644 --- a/apps/shared/list_parameter_controller.h +++ b/apps/shared/list_parameter_controller.h @@ -4,7 +4,7 @@ #include #include "function.h" #include "function_store.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/scrollable_exact_approximate_expressions_view.cpp b/apps/shared/scrollable_exact_approximate_expressions_view.cpp index 3b286e6b1..fc86fcfed 100644 --- a/apps/shared/scrollable_exact_approximate_expressions_view.cpp +++ b/apps/shared/scrollable_exact_approximate_expressions_view.cpp @@ -1,5 +1,5 @@ #include "scrollable_exact_approximate_expressions_view.h" -#include "../i18n.h" +#include #include using namespace Poincare; diff --git a/apps/shared/storage_expression_model_list_controller.h b/apps/shared/storage_expression_model_list_controller.h index 47d225b55..d2bdfb43d 100644 --- a/apps/shared/storage_expression_model_list_controller.h +++ b/apps/shared/storage_expression_model_list_controller.h @@ -3,7 +3,7 @@ #include #include "storage_expression_model_store.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/storage_function_list_controller.h b/apps/shared/storage_function_list_controller.h index 2e48ed3a9..dfc7bcfe7 100644 --- a/apps/shared/storage_function_list_controller.h +++ b/apps/shared/storage_function_list_controller.h @@ -7,7 +7,7 @@ #include "function_title_cell.h" #include "storage_list_parameter_controller.h" #include "storage_expression_model_list_controller.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/storage_list_parameter_controller.h b/apps/shared/storage_list_parameter_controller.h index 46aeb8921..35b56ffdd 100644 --- a/apps/shared/storage_list_parameter_controller.h +++ b/apps/shared/storage_list_parameter_controller.h @@ -3,7 +3,7 @@ #include #include "storage_function_store.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/storage_values_controller.h b/apps/shared/storage_values_controller.h index 1e9fb5629..fa345d8e6 100644 --- a/apps/shared/storage_values_controller.h +++ b/apps/shared/storage_values_controller.h @@ -9,7 +9,7 @@ #include "values_parameter_controller.h" #include "storage_values_function_parameter_controller.h" #include "interval_parameter_controller.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/storage_values_function_parameter_controller.h b/apps/shared/storage_values_function_parameter_controller.h index d41e51073..6d2a4b376 100644 --- a/apps/shared/storage_values_function_parameter_controller.h +++ b/apps/shared/storage_values_function_parameter_controller.h @@ -3,7 +3,7 @@ #include #include "storage_function.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/store_parameter_controller.h b/apps/shared/store_parameter_controller.h index 602ffd7aa..fa3212778 100644 --- a/apps/shared/store_parameter_controller.h +++ b/apps/shared/store_parameter_controller.h @@ -3,7 +3,7 @@ #include #include "double_pair_store.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/text_field_delegate_app.h b/apps/shared/text_field_delegate_app.h index 3bad9e1ac..20e6eb0e8 100644 --- a/apps/shared/text_field_delegate_app.h +++ b/apps/shared/text_field_delegate_app.h @@ -4,7 +4,7 @@ #include #include #include "input_event_handler_delegate_app.h" -#include "../i18n.h" +#include class AppsContainer; diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h index 525c6210c..2eca47217 100644 --- a/apps/shared/values_controller.h +++ b/apps/shared/values_controller.h @@ -9,7 +9,7 @@ #include "values_parameter_controller.h" #include "values_function_parameter_controller.h" #include "interval_parameter_controller.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/values_function_parameter_controller.h b/apps/shared/values_function_parameter_controller.h index 7fd5f017f..b6c303d8a 100644 --- a/apps/shared/values_function_parameter_controller.h +++ b/apps/shared/values_function_parameter_controller.h @@ -3,7 +3,7 @@ #include #include "function.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shared/zoom_parameter_controller.h b/apps/shared/zoom_parameter_controller.h index 186d9a468..13751a1b2 100644 --- a/apps/shared/zoom_parameter_controller.h +++ b/apps/shared/zoom_parameter_controller.h @@ -4,7 +4,7 @@ #include #include "interactive_curve_view_range.h" #include "curve_view.h" -#include "../i18n.h" +#include namespace Shared { diff --git a/apps/shift_alpha_lock_view.h b/apps/shift_alpha_lock_view.h index f96dcfedc..b3b0bd05d 100644 --- a/apps/shift_alpha_lock_view.h +++ b/apps/shift_alpha_lock_view.h @@ -3,7 +3,7 @@ #include #include "lock_view.h" -#include "i18n.h" +#include class ShiftAlphaLockView : public View { public: diff --git a/apps/solver/app.cpp b/apps/solver/app.cpp index f00b7abe0..a27ad587e 100644 --- a/apps/solver/app.cpp +++ b/apps/solver/app.cpp @@ -1,5 +1,5 @@ #include "app.h" -#include "../i18n.h" +#include #include "solver_icon.h" using namespace Shared; diff --git a/apps/solver/equation_models_parameter_controller.cpp b/apps/solver/equation_models_parameter_controller.cpp index 33ecf50d1..d1ab2622c 100644 --- a/apps/solver/equation_models_parameter_controller.cpp +++ b/apps/solver/equation_models_parameter_controller.cpp @@ -3,7 +3,7 @@ #include "../constant.h" #include #include -#include "../i18n.h" +#include using namespace Poincare; diff --git a/apps/solver/interval_controller.cpp b/apps/solver/interval_controller.cpp index 16514c0c9..19d061602 100644 --- a/apps/solver/interval_controller.cpp +++ b/apps/solver/interval_controller.cpp @@ -1,6 +1,6 @@ #include "interval_controller.h" #include "app.h" -#include "../i18n.h" +#include #include #include diff --git a/apps/solver/list_controller.h b/apps/solver/list_controller.h index 9355e9f37..14ca87f87 100644 --- a/apps/solver/list_controller.h +++ b/apps/solver/list_controller.h @@ -8,7 +8,7 @@ #include "equation_store.h" #include "equation_list_view.h" #include "equation_models_parameter_controller.h" -#include "../i18n.h" +#include namespace Solver { diff --git a/apps/solver/solutions_controller.h b/apps/solver/solutions_controller.h index 6ad68bceb..172faf761 100644 --- a/apps/solver/solutions_controller.h +++ b/apps/solver/solutions_controller.h @@ -4,7 +4,7 @@ #include #include "equation_store.h" #include "../shared/scrollable_exact_approximate_expressions_cell.h" -#include "../i18n.h" +#include namespace Solver { diff --git a/apps/statistics/app.cpp b/apps/statistics/app.cpp index 64c935553..787e51ace 100644 --- a/apps/statistics/app.cpp +++ b/apps/statistics/app.cpp @@ -1,6 +1,6 @@ #include "app.h" #include "stat_icon.h" -#include "../i18n.h" +#include using namespace Shared; diff --git a/apps/statistics/box_banner_view.h b/apps/statistics/box_banner_view.h index 9192e8275..a53060061 100644 --- a/apps/statistics/box_banner_view.h +++ b/apps/statistics/box_banner_view.h @@ -3,7 +3,7 @@ #include #include "../shared/banner_view.h" -#include "../i18n.h" +#include namespace Statistics { diff --git a/apps/statistics/histogram_banner_view.h b/apps/statistics/histogram_banner_view.h index dcb3df8f3..161c78a37 100644 --- a/apps/statistics/histogram_banner_view.h +++ b/apps/statistics/histogram_banner_view.h @@ -3,7 +3,7 @@ #include #include "../shared/banner_view.h" -#include "../i18n.h" +#include namespace Statistics { diff --git a/apps/statistics/multiple_data_view_controller.cpp b/apps/statistics/multiple_data_view_controller.cpp index c9687b55c..73ed94fe9 100644 --- a/apps/statistics/multiple_data_view_controller.cpp +++ b/apps/statistics/multiple_data_view_controller.cpp @@ -1,5 +1,5 @@ #include "multiple_data_view_controller.h" -#include "../i18n.h" +#include #include using namespace Shared; diff --git a/apps/title_bar_view.h b/apps/title_bar_view.h index 264be8a96..b5335dc76 100644 --- a/apps/title_bar_view.h +++ b/apps/title_bar_view.h @@ -4,7 +4,7 @@ #include #include "battery_view.h" #include "shift_alpha_lock_view.h" -#include "i18n.h" +#include class TitleBarView : public View { public: diff --git a/apps/usb/usb_connected_controller.cpp b/apps/usb/usb_connected_controller.cpp index a03835dc6..189c060bd 100644 --- a/apps/usb/usb_connected_controller.cpp +++ b/apps/usb/usb_connected_controller.cpp @@ -1,5 +1,5 @@ #include "usb_connected_controller.h" -#include "../i18n.h" +#include namespace USB { diff --git a/apps/variable_box_controller.h b/apps/variable_box_controller.h index f4e986a97..13da1ea3c 100644 --- a/apps/variable_box_controller.h +++ b/apps/variable_box_controller.h @@ -6,7 +6,7 @@ #include #include "shared/global_context.h" #include "variable_box_empty_controller.h" -#include "i18n.h" +#include class VariableBoxController : public NestedMenuController { public: diff --git a/apps/variable_box_empty_controller.cpp b/apps/variable_box_empty_controller.cpp index 741b025ae..0c810bdd8 100644 --- a/apps/variable_box_empty_controller.cpp +++ b/apps/variable_box_empty_controller.cpp @@ -1,7 +1,7 @@ #include "variable_box_empty_controller.h" #include #include "graph/storage_cartesian_function_store.h" -#include "i18n.h" +#include #include using namespace Poincare;