changeset 587:c027304ced27

misc: add NLS for ui/rpg
author David Demelier <markand@malikania.fr>
date Sat, 18 Mar 2023 20:29:15 +0100
parents 4349b591c3ac
children 0bf939090d33
files libmlk-core/CMakeLists.txt libmlk-core/mlk/core/core_p.h libmlk-rpg/CMakeLists.txt libmlk-rpg/mlk/rpg/rpg_p.h libmlk-ui/mlk/ui/debug.c libmlk-ui/mlk/ui/gridmenu.c libmlk-ui/mlk/ui/notify.c libmlk-ui/mlk/ui/ui.c libmlk-ui/mlk/ui/ui_p.h
diffstat 9 files changed, 75 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/libmlk-core/CMakeLists.txt	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-core/CMakeLists.txt	Sat Mar 18 20:29:15 2023 +0100
@@ -20,33 +20,34 @@
 
 set(
 	SOURCES
+	${libmlk-core_SOURCE_DIR}/mlk/core/action-script.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/action-stack.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/action.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/alloc.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/animation.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/clock.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/core.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/core.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/core_p.h
+	${libmlk-core_SOURCE_DIR}/mlk/core/drawable-stack.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/drawable.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/err.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/event.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/font.c
 	${libmlk-core_SOURCE_DIR}/mlk/core/game.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/sprite.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/trace.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/gamepad.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/image.c
 	${libmlk-core_SOURCE_DIR}/mlk/core/maths.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/sys.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/util.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/drawable-stack.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/action-script.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/state.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/texture.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/font.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/music.c
 	${libmlk-core_SOURCE_DIR}/mlk/core/painter.c
 	${libmlk-core_SOURCE_DIR}/mlk/core/panic.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/gamepad.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/image.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/alloc.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/clock.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/action-stack.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/core.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/animation.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/err.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/music.c
 	${libmlk-core_SOURCE_DIR}/mlk/core/sound.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/event.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/drawable.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/action.c
-	${libmlk-core_SOURCE_DIR}/mlk/core/window.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/sprite.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/state.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/sys.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/texture.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/trace.c
+	${libmlk-core_SOURCE_DIR}/mlk/core/util.c
 )
 
 set(
--- a/libmlk-core/mlk/core/core_p.h	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-core/mlk/core/core_p.h	Sat Mar 18 20:29:15 2023 +0100
@@ -1,7 +1,7 @@
 /*
- * core_p -- libcore private definitions
+ * core_p.h -- libmlk-core private definitions
  *
- * Copyright (c) 2020-2022 David Demelier <markand@malikania.fr>
+ * Copyright (c) 2020-2023 David Demelier <markand@malikania.fr>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
--- a/libmlk-rpg/CMakeLists.txt	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-rpg/CMakeLists.txt	Sat Mar 18 20:29:15 2023 +0100
@@ -34,6 +34,7 @@
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/quest.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/rpg.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/rpg.h
+	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/rpg_p.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/save.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/save.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset-loader-file.c
@@ -43,7 +44,6 @@
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset.c
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/tileset.h
 	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/walksprite.c
-	${libmlk-rpg_SOURCE_DIR}/mlk/rpg/walksprite.h
 )
 
 set(
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libmlk-rpg/mlk/rpg/rpg_p.h	Sat Mar 18 20:29:15 2023 +0100
@@ -0,0 +1,32 @@
+/*
+ * rpg_p.h -- libmlk-rpg private definitions
+ *
+ * Copyright (c) 2020-2023 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef MLK_RPG_RPG_P_H
+#define MLK_RPG_RPG_P_H
+
+#include "sysconfig.h"
+
+#if defined(MLK_WITH_NLS)
+#       include <libintl.h>
+#       define _(s) dgettext("libmlk-rpg", s)
+#else
+#       define _(s) s
+#endif
+
+#endif /* !MLK_RPG_RPG_P_H */
+
--- a/libmlk-ui/mlk/ui/debug.c	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-ui/mlk/ui/debug.c	Sat Mar 18 20:29:15 2023 +0100
@@ -29,7 +29,7 @@
 #if !defined(NDEBUG)
 	.enable = 1
 #else
-    .enable = 0
+	.enable = 0
 #endif
 };
 
--- a/libmlk-ui/mlk/ui/gridmenu.c	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-ui/mlk/ui/gridmenu.c	Sat Mar 18 20:29:15 2023 +0100
@@ -87,7 +87,7 @@
 	 * is outside of the elements.
 	 */
 	if (reqw > menu->w) {
-		mlk_tracef("gridmenu width is too small: %u < %u", menu->w, reqw);
+		mlk_tracef(_("gridmenu width is too small: %u < %u"), menu->w, reqw);
 		menu->spacew = 1;
 	} else if (menu->ncols > 1) {
 		reqw -= style->padding * 2;
@@ -95,7 +95,7 @@
 	}
 
 	if (reqh > menu->h) {
-		mlk_tracef("gridmenu height is too small: %u < %u", menu->h, reqh);
+		mlk_tracef(_("gridmenu height is too small: %u < %u"), menu->h, reqh);
 		menu->spaceh = 1;
 	} else if (menu->nrows > 1) {
 		reqh -= style->padding * 2;
@@ -213,7 +213,7 @@
 			color = style->text_color;
 
 		if (mlk_font_render(font, &tex, menu->items[item], color) < 0) {
-			mlk_tracef("unable to render grid menu item: %s", mlk_err());
+			mlk_tracef(_("unable to render grid menu item: %s"), mlk_err());
 			continue;
 		}
 
--- a/libmlk-ui/mlk/ui/notify.c	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-ui/mlk/ui/notify.c	Sat Mar 18 20:29:15 2023 +0100
@@ -30,6 +30,7 @@
 #include "align.h"
 #include "notify.h"
 #include "ui.h"
+#include "ui_p.h"
 
 #define WIDTH   (mlk_window.w / 2.5)
 #define HEIGHT  (mlk_window.h / 10)
@@ -75,7 +76,7 @@
 
 	/* Align icon at the left center. */
 	if (n->icon->h >= HEIGHT) {
-		mlk_tracef("notification icon is too large: %u > %u", n->icon->h, HEIGHT);
+		mlk_tracef(_("notification icon is too large: %u > %u"), n->icon->h, HEIGHT);
 		geo->icon_x = x + mlk_notify_style.padding;
 		geo->icon_y = y + mlk_notify_style.padding;
 	} else {
--- a/libmlk-ui/mlk/ui/ui.c	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-ui/mlk/ui/ui.c	Sat Mar 18 20:29:15 2023 +0100
@@ -30,6 +30,7 @@
 
 #include "align.h"
 #include "ui.h"
+#include "ui_p.h"
 
 /* Default font catalog. */
 #define FONT_DEF(b, s, i)                                               \
@@ -94,7 +95,7 @@
 	int x, y;
 
 	if (mlk_font_render(font, &texture, text, color) < 0)
-		mlk_tracef("unable to render text: %s", mlk_err());
+		mlk_tracef(_("unable to render text: %s"), mlk_err());
 	else {
 		mlk_align(align, &x, &y, texture.w, texture.h, px, py, pw, ph);
 		mlk_texture_draw(&texture, x, y);
--- a/libmlk-ui/mlk/ui/ui_p.h	Sat Mar 18 20:05:58 2023 +0100
+++ b/libmlk-ui/mlk/ui/ui_p.h	Sat Mar 18 20:29:15 2023 +0100
@@ -19,6 +19,8 @@
 #ifndef MLK_UI_P_H
 #define MLK_UI_P_H
 
+#include "sysconfig.h"
+
 #define MLK__DELEGATE_INVOKE(d, def, f, ...)            \
 do {                                                    \
         if (d && d->f)                                  \
@@ -38,4 +40,11 @@
 #define MLK__STYLE(w, d)                                \
         (w->style ? w->style : &d)
 
+#if defined(MLK_WITH_NLS)
+#       include <libintl.h>
+#       define _(s) dgettext("libmlk-ui", s)
+#else
+#       define _(s) s
+#endif
+
 #endif /* !MLK_UI_P_H */