aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt158
-rw-r--r--src/gettext.h9
-rw-r--r--src/guiMainMenu.cpp27
-rw-r--r--src/guiMessageMenu.cpp3
-rw-r--r--src/guiPasswordChange.cpp13
-rw-r--r--src/guiPauseMenu.cpp12
-rw-r--r--src/guiTextInputMenu.cpp3
-rw-r--r--src/main.cpp2
8 files changed, 146 insertions, 81 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 532ac9fee..dc9dc03a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,32 @@
-project(minetest)
+project(minetest-delta)
cmake_minimum_required( VERSION 2.6 )
if(RUN_IN_PLACE)
add_definitions ( -DRUN_IN_PLACE )
endif(RUN_IN_PLACE)
+OPTION(USE_GETTEXT "Use GetText for internationalization" OFF)
+
+if(USE_GETTEXT)
+ find_package(GettextLib REQUIRED)
+ message(STATUS "gettext include path: ${GETTEXT_INCLUDE_DIR}")
+ message(STATUS "gettext msgfmt path: ${GETTEXT_MSGFMT}")
+ if(WIN32)
+ message(STATUS "gettext library: ${GETTEXT_LIBRARY}")
+ message(STATUS "gettext dll: ${GETTEXT_DLL}")
+ message(STATUS "gettext iconv dll: ${GETTEXT_ICONV_DLL}")
+ endif()
+ if (GETTEXT_FOUND)
+ add_definitions( -DUSE_GETTEXT )
+ message(STATUS "GetText enabled; locales found: ${GETTEXT_AVAILABLE_LOCALES}")
+ else()
+ message(STATUS "ERROR: GetText enabled but not found, disabling")
+ set(USE_GETTEXT FALSE)
+ endif(GETTEXT_FOUND)
+else(USE_GETTEXT)
+ message(STATUS "GetText disabled")
+endif(USE_GETTEXT)
+
if(NOT MSVC)
set(USE_GPROF 0 CACHE BOOL "Use -pg flag for g++")
endif()
@@ -27,12 +49,6 @@ if(WIN32)
CACHE FILEPATH "Path to zlibwapi.lib")
set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
CACHE FILEPATH "Path to zlibwapi.dll (for installation)")
- set(GETTEXT_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../gettext/include"
- CACHE PATH "gettext include directory")
- set(GETTEXT_BIN_DIR "${PROJECT_SOURCE_DIR}/../../gettext/bin"
- CACHE PATH "gettext bin directory")
- set(GETTEXT_LIBRARIES "${PROJECT_SOURCE_DIR}/../../gettext/lib/intl.lib"
- CACHE FILEPATH "gettext intl.lib")
set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
CACHE PATH "irrlicht dir")
else()
@@ -153,9 +169,9 @@ include_directories(
set(EXECUTABLE_OUTPUT_PATH ../bin)
if(BUILD_CLIENT)
- add_executable(minetest ${minetest_SRCS})
+ add_executable(${PROJECT_NAME} ${minetest_SRCS})
target_link_libraries(
- minetest
+ ${PROJECT_NAME}
${ZLIB_LIBRARIES}
${IRRLICHT_LIBRARY}
${OPENGL_LIBRARIES}
@@ -163,7 +179,7 @@ if(BUILD_CLIENT)
${BZIP2_LIBRARIES}
${PNG_LIBRARIES}
${X11_LIBRARIES}
- ${GETTEXT_LIBRARIES}
+ ${GETTEXT_LIBRARY}
${PLATFORM_LIBS}
${CLIENT_PLATFORM_LIBS}
${JTHREAD_LIBRARY}
@@ -172,9 +188,9 @@ if(BUILD_CLIENT)
endif(BUILD_CLIENT)
if(BUILD_SERVER)
- add_executable(minetestserver ${minetestserver_SRCS})
+ add_executable(${PROJECT_NAME}server ${minetestserver_SRCS})
target_link_libraries(
- minetestserver
+ ${PROJECT_NAME}server
${ZLIB_LIBRARIES}
${PLATFORM_LIBS}
${JTHREAD_LIBRARY}
@@ -199,7 +215,7 @@ if(MSVC)
set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Ob0 /Od /RTC1")
if(BUILD_SERVER)
- set_target_properties(minetestserver PROPERTIES
+ set_target_properties(${PROJECT_NAME}server PROPERTIES
COMPILE_DEFINITIONS "SERVER")
endif(BUILD_SERVER)
@@ -221,10 +237,6 @@ else()
set(ARCH i386)
endif()
- if(WIN32)
- set(CMAKE_EXE_LINKER_FLAGS "-lintl -L ${GETTEXT_BIN_DIR}")
- endif()
-
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")
@@ -233,7 +245,7 @@ else()
endif()
if(BUILD_SERVER)
- set_target_properties(minetestserver PROPERTIES
+ set_target_properties(${PROJECT_NAME}server PROPERTIES
COMPILE_DEFINITIONS "SERVER")
endif(BUILD_SERVER)
@@ -250,15 +262,20 @@ endif()
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
if(BUILD_CLIENT)
- install(TARGETS minetest DESTINATION ${BINDIR})
+ install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/*.png")
install(FILES ${images} DESTINATION ${DATADIR})
- install(FILES ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo DESTINATION locale/de/LC_MESSAGES)
- install(FILES ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo DESTINATION locale/fr/LC_MESSAGES)
-
+ if (USE_GETTEXT)
+ foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+ set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
+ set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
+ install(FILES ${MO_BUILD_PATH} DESTINATION ${MO_DEST_PATH})
+ endforeach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+ endif()
+
if(WIN32)
if(DEFINED IRRLICHT_DLL)
install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
@@ -266,50 +283,71 @@ if(BUILD_CLIENT)
if(DEFINED ZLIB_DLL)
install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
endif()
- if(DEFINED GETTEXT_BIN_DIR)
- install(FILES ${GETTEXT_BIN_DIR}/libintl3.dll DESTINATION ${BINDIR})
- install(FILES ${GETTEXT_BIN_DIR}/libiconv2.dll DESTINATION ${BINDIR})
- endif()
+ if(USE_GETTEXT)
+ if(DEFINED GETTEXT_DLL)
+ install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
+ endif()
+ if(DEFINED GETTEXT_ICONV_DLL)
+ install(FILES ${GETTEXT_ICONV_DLL} DESTINATION ${BINDIR})
+ endif()
+ endif(USE_GETTEXT)
endif()
endif(BUILD_CLIENT)
if(BUILD_SERVER)
- install(TARGETS minetestserver DESTINATION ${BINDIR})
+ install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR})
endif(BUILD_SERVER)
-if(WIN32)
- set(GETTEXT_MSGFMT "${GETTEXT_BIN_DIR}/msgfmt" CACHE FILEPATH "path to msgfmt")
-elseif(APPLE)
- set(GETTEXT_MSGFMT "${GETTEXT_BIN_DIR}/msgfmt" CACHE FILEPATH "path to msgfmt")
-else()
- set(GETTEXT_MSGFMT "msgfmt")
-endif()
-
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMENT "mo-update [de]: Creating locale directory.")
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES COMMENT "mo-update [fr]: Creating locale directory.")
-
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo
- COMMAND ${GETTEXT_MSGFMT} -o ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo ${CMAKE_SOURCE_DIR}/po/de/minetest-c55.po
- DEPENDS
- ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES
- ${CMAKE_SOURCE_DIR}/po/de/minetest-c55.po
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po/de
- COMMENT "mo-update [de]: Creating mo file."
- )
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo
- COMMAND ${GETTEXT_MSGFMT} -o ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo ${CMAKE_SOURCE_DIR}/po/fr/minetest-c55.po
- DEPENDS
- ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES
- ${CMAKE_SOURCE_DIR}/po/fr/minetest-c55.po
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po/fr
- COMMENT "mo-update [fr]: Creating mo file."
- )
-
-add_custom_target(translation_de ALL COMMENT "mo update [de]" DEPENDS ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo)
-add_custom_target(translation_fr ALL COMMENT "mo update [fr]" DEPENDS ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo)
-
+if (USE_GETTEXT)
+ add_custom_command(OUTPUT "${GETTEXT_PO_PATH}/en"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${GETTEXT_PO_PATH}/en"
+ COMMENT "po-update [en]: creating translation template base directory")
+ set(POT_FILE "${GETTEXT_PO_PATH}/en/minetest.pot")
+ file(GLOB GETTEXT_POT_DEPS *.cpp *.h)
+ file(GLOB GETTEXT_POT_DEPS_REL RELATIVE ${CMAKE_SOURCE_DIR} *.cpp *.h)
+ add_custom_command(OUTPUT ${POT_FILE}
+ COMMAND ${GETTEXT_EXTRACT} -F -n -o ${POT_FILE} ${GETTEXT_POT_DEPS_REL}
+ DEPENDS "${GETTEXT_PO_PATH}/en" ${GETTEXT_POT_DEPS}
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ COMMENT "po-update [en]: updating translation template")
+
+ set(PO_FILES)
+ set(MO_FILES)
+
+ foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+ # skip the 'en' locale which is treated separately
+ if (NOT LOCALE STREQUAL "en")
+ set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/minetest.po")
+ add_custom_command(OUTPUT ${PO_FILE_PATH}
+ COMMAND ${GETTEXT_MSGMERGE} -F -U ${PO_FILE_PATH} ${POT_FILE}
+ DEPENDS ${POT_FILE}
+ WORKING_DIRECTORY "${GETTEXT_PO_PATH}/${LOCALE}"
+ COMMENT "po-update [${LOCALE}]: updating strings")
+
+
+ set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
+ add_custom_command(OUTPUT ${MO_BUILD_PATH}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${MO_BUILD_PATH}
+ COMMENT "mo-update [${LOCALE}]: Creating locale directory.")
+
+ set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
+
+ add_custom_command(
+ OUTPUT ${MO_FILE_PATH}
+ COMMAND ${GETTEXT_MSGFMT} -o ${MO_FILE_PATH} ${PO_FILE_PATH}
+ DEPENDS ${MO_BUILD_PATH} ${PO_FILE_PATH}
+ WORKING_DIRECTORY "${GETTEXT_PO_PATH}/${LOCALE}"
+ COMMENT "mo-update [${LOCALE}]: Creating mo file."
+ )
+
+ set(MO_FILES ${MO_FILES} ${MO_FILE_PATH})
+ set(PO_FILES ${PO_FILES} ${PO_FILE_PATH})
+ endif(NOT LOCALE STREQUAL "en")
+ endforeach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
+
+ add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES})
+ add_custom_target(updatepo COMMENT "po update" DEPENDS ${PO_FILES})
+endif(USE_GETTEXT)
# Subdirectories
diff --git a/src/gettext.h b/src/gettext.h
index 7f5f56e49..8ddb95346 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,9 +1,16 @@
+#ifdef USE_GETTEXT
#include <libintl.h>
+#else
+#define gettext(String) String
+#define bindtextdomain(domain, dir) /* */
+#define textdomain(domain) /* */
+#endif
+
#define _(String) gettext(String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
-inline wchar_t* chartowchar_t(char *str)
+inline wchar_t* chartowchar_t(const char *str)
{
size_t l = strlen(str)+1;
wchar_t* nstr = new wchar_t[l];
diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index f557f4dc0..1d7f224f6 100644
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -177,7 +177,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, 50+6);
- Environment->addStaticText(chartowchar_t(gettext("Name/Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Name/Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -199,7 +200,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, 100+6);
- Environment->addStaticText(chartowchar_t(gettext("Address/Port")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Address/Port")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -217,13 +219,15 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
}
{
core::rect<s32> rect(0, 0, 400, 20);
- Environment->addStaticText(chartowchar_t(gettext("Leave address blank to start a local server.")), rect, false, true, this, -1);
+ rect += topleft_client + v2s32(160, 100+35);
+ Environment->addStaticText(chartowchar_t(gettext("Leave address blank to start a local server.")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_client + v2s32(35, 150);
Environment->addCheckBox(fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
- chartowchar_t(gettext("Fancy trees")));
+ chartowchar_t(gettext("Fancy trees")));
}
{
core::rect<s32> rect(0, 0, 250, 30);
@@ -236,7 +240,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 180, 30);
//rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
rect += topleft_client + v2s32(size_client.X-180-40, 150+25);
- Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON, chartowchar_t(gettext("Start Game / Connect")));
+ Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
+ chartowchar_t(gettext("Start Game / Connect")));
}
// Key change button
@@ -244,7 +249,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 100, 30);
//rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
rect += topleft_client + v2s32(size_client.X-180-40-100-20, 150+25);
- Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON, chartowchar_t(gettext("Change keys")));
+ Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
+ chartowchar_t(gettext("Change keys")));
}
/*
Server section
@@ -266,19 +272,22 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_server + v2s32(35, 30);
- Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB, chartowchar_t(gettext("Creative Mode")));
+ Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB,
+ chartowchar_t(gettext("Creative Mode")));
}
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_server + v2s32(35, 60);
- Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB, chartowchar_t(gettext("Enable Damage")));
+ Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB,
+ chartowchar_t(gettext("Enable Damage")));
}
// Map delete button
{
core::rect<s32> rect(0, 0, 130, 30);
//rect += topleft_server + v2s32(size_server.X-40-130, 100+25);
rect += topleft_server + v2s32(40, 100+25);
- Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON, chartowchar_t(gettext("Delete map")));
+ Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON,
+ chartowchar_t(gettext("Delete map")));
}
}
diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp
index e4e582ab1..155be6029 100644
--- a/src/guiMessageMenu.cpp
+++ b/src/guiMessageMenu.cpp
@@ -89,7 +89,8 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
gui::IGUIElement *e =
- Environment->addButton(rect, this, 257, chartowchar_t(gettext("Proceed")));
+ Environment->addButton(rect, this, 257,
+ chartowchar_t(gettext("Proceed")));
Environment->setFocus(e);
}
}
diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 79601a99f..fabe75110 100644
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -99,7 +99,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("Old Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Old Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -113,7 +114,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("New Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("New Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -126,7 +128,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("Confirm Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Confirm Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -148,7 +151,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 300, 20);
rect += topleft_client + v2s32(35, ypos);
IGUIElement *e =
- Environment->addStaticText(chartowchar_t(gettext("Passwords do not match!")), rect, false, true, this, ID_message);
+ Environment->addStaticText(
+ chartowchar_t(gettext("Passwords do not match!")),
+ rect, false, true, this, ID_message);
e->setVisible(false);
}
diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 5f40a4820..61485518c 100644
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -106,25 +106,29 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 256, chartowchar_t(gettext("Continue")));
+ Environment->addButton(rect, this, 256,
+ chartowchar_t(gettext("Continue")));
}
btn_y += btn_height + btn_gap;
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 261, chartowchar_t(gettext("Change Password")));
+ Environment->addButton(rect, this, 261,
+ chartowchar_t(gettext("Change Password")));
}
btn_y += btn_height + btn_gap;
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 260, chartowchar_t(gettext("Disconnect")));
+ Environment->addButton(rect, this, 260,
+ chartowchar_t(gettext("Disconnect")));
}
btn_y += btn_height + btn_gap;
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 257, chartowchar_t(gettext("Exit to OS")));
+ Environment->addButton(rect, this, 257,
+ chartowchar_t(gettext("Exit to OS")));
}
{
diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index b15f8bc07..252e452f5 100644
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -107,7 +107,8 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
- Environment->addButton(rect, this, 257, chartowchar_t(gettext("Proceed")));
+ Environment->addButton(rect, this, 257,
+ chartowchar_t(gettext("Proceed")));
}
}
diff --git a/src/main.cpp b/src/main.cpp
index b6a53566e..a7634a3c1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1132,7 +1132,7 @@ int main(int argc, char *argv[])
// Create user data directory
fs::CreateDir(porting::path_userdata);
- setlocale(LC_ALL, "");
+ setlocale(LC_MESSAGES, "");
bindtextdomain("minetest-c55", (porting::path_userdata+"/locale").c_str());
textdomain("minetest-c55");
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 15:48:30 +0000