M enabled_unittests => enabled_unittests +1 -1
@@ 328,7 328,7 @@ TESTS_LIST["catch2-utils-log"]="
Log tests;
"
#---------
-TESTS_LIST["catch2-utils-i18n"]="
+TESTS_LIST["catch2-i18n"]="
Test set display language - empty display language string;
Test set display language - invalid display language string;
Test set display language - double invalid display language string;
M module-apps/CMakeLists.txt => module-apps/CMakeLists.txt +3 -2
@@ 73,14 73,15 @@ target_link_libraries(${PROJECT_NAME}
PRIVATE
apps-common
date::date
+ eventstore
+ i18n
+ Microsoft.GSL::GSL
service-antenna
service-appmgr
service-audio
service-cellular
service-db
service-evtmgr
- Microsoft.GSL::GSL
- eventstore
time
PUBLIC
application-bell-main
M module-apps/application-onboarding/model/EULARepository.cpp => module-apps/application-onboarding/model/EULARepository.cpp +2 -3
@@ 1,10 1,9 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include <gsl/util>
-#include "module-utils/i18n/i18n.hpp"
-
#include "EULARepository.hpp"
+#include <gsl/util>
+#include <i18n/i18n.hpp>
#include <fstream>
#include <sstream>
M module-db/CMakeLists.txt => module-db/CMakeLists.txt +1 -0
@@ 176,6 176,7 @@ target_compile_options(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PUBLIC
+ i18n
module-utils
module-vfs
utf8
M module-gui/CMakeLists.txt => module-gui/CMakeLists.txt +5 -4
@@ 21,15 21,16 @@ include_directories( ../module-utils )
target_link_libraries(${PROJECT_NAME}
PUBLIC
+ ${TARGET_LIBRARIES}
+ eventstore
math
module-utils
utf8
- eventstore
- ${TARGET_LIBRARIES}
PRIVATE
- pugixml::pugixml
- Microsoft.GSL::GSL
+ i18n
json::json
+ Microsoft.GSL::GSL
+ pugixml::pugixml
time
)
M module-gui/gui/widgets/CheckBox.cpp => module-gui/gui/widgets/CheckBox.cpp +1 -1
@@ 4,7 4,7 @@
#include "CheckBox.hpp"
#include "InputEvent.hpp"
#include "Style.hpp"
-#include "Utils.hpp"
+#include <i18n/i18n.hpp>
namespace gui
{
M module-gui/gui/widgets/status-bar/BatteryText.cpp => module-gui/gui/widgets/status-bar/BatteryText.cpp +2 -1
@@ 3,8 3,9 @@
#include "BatteryText.hpp"
#include "Label.hpp"
-#include <Utils.hpp>
#include "Style.hpp"
+#include <i18n/i18n.hpp>
+#include <Utils.hpp>
namespace gui::status_bar
{
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +5 -6
@@ 1,4 1,4 @@
-project(module-utils VERSION 1.0)
+project(module-utils VERSION 1.0)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
@@ 6,11 6,7 @@ endif()
module_is_test_entity()
-add_subdirectory(Clipboard)
-add_subdirectory(EventStore)
-
set (SOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}/i18n/i18n.cpp
${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.cpp
${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.hpp
${CMAKE_CURRENT_SOURCE_DIR}/NumberHolderMatcher.hpp
@@ 67,8 63,11 @@ endif()
add_subdirectory(board)
add_subdirectory(bootconfig)
+add_subdirectory(Clipboard)
+add_subdirectory(EventStore)
+add_subdirectory(i18n)
add_subdirectory(log)
+add_subdirectory(math)
add_subdirectory(time)
add_subdirectory(ucs2)
add_subdirectory(utf8)
-add_subdirectory(math)
M module-utils/Utils.hpp => module-utils/Utils.hpp +0 -2
@@ 3,9 3,7 @@
#pragma once
#include "Split.hpp"
-#include <i18n/i18n.hpp>
#include <log.hpp>
-
#include <magic_enum.hpp>
#include <algorithm> // std::find_if_not
A module-utils/i18n/CMakeLists.txt => module-utils/i18n/CMakeLists.txt +30 -0
@@ 0,0 1,30 @@
+add_library(i18n STATIC)
+
+module_is_test_entity(i18n)
+
+target_sources(i18n
+ PRIVATE
+ i18n.cpp
+ i18nImpl.hpp
+ PUBLIC
+ include/i18n/i18n.hpp
+)
+
+target_include_directories(i18n
+ PRIVATE
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+target_link_libraries(i18n
+ PRIVATE
+ json::json
+ log
+ module-os
+ module-vfs
+)
+
+if (${ENABLE_TESTS})
+ add_subdirectory(tests)
+endif()
M module-utils/i18n/i18n.cpp => module-utils/i18n/i18n.cpp +0 -1
@@ 3,7 3,6 @@
#include "i18nImpl.hpp"
#include <log.hpp>
-#include <Utils.hpp>
#include <cstdio>
#include <purefs/filesystem_paths.hpp>
M module-utils/i18n/i18nImpl.hpp => module-utils/i18n/i18nImpl.hpp +1 -1
@@ 5,7 5,7 @@
#include <mutex.hpp>
#include <json11.hpp>
-#include "i18n.hpp"
+#include <i18n/i18n.hpp>
namespace utils
{
R module-utils/i18n/i18n.hpp => module-utils/i18n/include/i18n/i18n.hpp +0 -0
A module-utils/i18n/tests/CMakeLists.txt => module-utils/i18n/tests/CMakeLists.txt +8 -0
@@ 0,0 1,8 @@
+add_catch2_executable(
+ NAME
+ i18n
+ SRCS
+ test_i18n.cpp
+ LIBS
+ i18n
+)
R module-utils/test/test_i18n.cpp => module-utils/i18n/tests/test_i18n.cpp +0 -0
M module-utils/test/CMakeLists.txt => module-utils/test/CMakeLists.txt +0 -10
@@ 60,13 60,3 @@ add_catch2_executable(
# LIBS
# module-utils
#)
-
-# i18n language change tests
-add_catch2_executable(
- NAME
- utils-i18n
- SRCS
- test_i18n.cpp
- LIBS
- module-utils
-)
M module-utils/time/CMakeLists.txt => module-utils/time/CMakeLists.txt +5 -3
@@ 24,11 24,13 @@ target_include_directories(time PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_
target_link_libraries(time
PRIVATE
- log
module-utils
- utf8
- utz::utz
time-constants
+ utz::utz
+ PUBLIC
+ i18n
+ log
+ utf8
)
if (${ENABLE_TESTS})