Fix native_language option

Mr-Dave · Mr-Dave · commit 8ae53b26634b · 2022-10-29T20:21:20.000-06:00
diff --git a/src/conf.c b/src/conf.c
@@ -29,8 +29,8 @@
 
 #include <dirent.h>
 #include <string.h>
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 
diff --git a/src/dbse.c b/src/dbse.c
@@ -21,8 +21,8 @@
  *
  */
 
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "dbse.h"
diff --git a/src/event.c b/src/event.c
@@ -22,8 +22,8 @@
     Copyright Jeroen Vreeken, 2002
 */
 
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "picture.h"
diff --git a/src/ffmpeg.c b/src/ffmpeg.c
@@ -34,8 +34,8 @@
  * indicate libav
 */
 
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "netcam.h"
diff --git a/src/jpegutils.c b/src/jpegutils.c
@@ -51,9 +51,9 @@
  *    jpgutl_decode_jpeg
  */
 
-#include "translate.h"
-#include "config.h"
 #include "motion.h"
+#include "config.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "jpegutils.h"
diff --git a/src/mmalcam.c b/src/mmalcam.c
@@ -25,8 +25,8 @@
  *
  */
 
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "netcam.h"
diff --git a/src/motion.c b/src/motion.c
@@ -20,8 +20,8 @@
  *    Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
  *
  */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "ffmpeg.h"
@@ -3527,7 +3527,7 @@ int main (int argc, char **argv)
 
     dbse_global_init(cnt_list);
 
-    translate_init();
+    translate_init(cnt_list[0]);
 
     do {
         if (restart) {
diff --git a/src/netcam.c b/src/netcam.c
@@ -21,8 +21,8 @@
  *
  */
 
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "netcam.h"
diff --git a/src/netcam_ftp.c b/src/netcam_ftp.c
@@ -22,8 +22,8 @@
  *      Copyright 2005, William M. Brack
  *
  */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include <ctype.h>
diff --git a/src/netcam_http.c b/src/netcam_http.c
@@ -25,8 +25,8 @@
  *      Copyright 2005, William M. Brack
  ***********************************************************/
 
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "netcam.h"
diff --git a/src/netcam_jpeg.c b/src/netcam_jpeg.c
@@ -26,8 +26,8 @@
  *
  *    Copyright 2005, William M. Brack
  */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "rotate.h"
diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.c
@@ -40,8 +40,8 @@
  ***********************************************************/
 
 #include <stdio.h>
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "rotate.h"
diff --git a/src/picture.c b/src/picture.c
@@ -22,8 +22,8 @@
  *    Portions of this file are Copyright 2010 by Wim Lewis (wiml@hhhh.org)
  *
  */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "picture.h"
diff --git a/src/rotate.c b/src/rotate.c
@@ -42,8 +42,8 @@
  *                       - speed optimization, including bswap
  *      v1 (28-Aug-2004) - initial version
  */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "rotate.h"
diff --git a/src/track.c b/src/track.c
@@ -21,8 +21,8 @@
  *    Copyright 2000, Jeroen Vreeken
  */
 #include <math.h>
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 
diff --git a/src/translate.c b/src/translate.c
@@ -27,15 +27,13 @@
 
 int nls_enabled;
 
+/* Testing routine for code development only.
+ * Does nothing in normal operations and just returns.
+*/
 void translate_locale_chg(const char *langcd)
 {
     #ifdef HAVE_GETTEXT
-        /* This routine is for development testing only.  It is not used for
-        * regular users because once this locale is change, it changes the
-        * whole computer over to the new locale.  Therefore, we just return
-        */
         return;
-
         setenv ("LANGUAGE", langcd, 1);
         /* Invoke external function to change locale*/
         ++_nl_msg_cat_cntr;
@@ -46,29 +44,23 @@ void translate_locale_chg(const char *langcd)
     #endif
 }
 
-void translate_init(void)
+void translate_init(struct context *cnt)
 {
     #ifdef HAVE_GETTEXT
-        /* Set the flag to enable native language support */
-        nls_enabled = 1;
-
-        setlocale (LC_ALL, "");
-
-        //translate_locale_chg("li");
-        translate_locale_chg("es");
-
-        bindtextdomain ("motion", LOCALEDIR);
-        bind_textdomain_codeset ("motion", "UTF-8");
-        textdomain ("motion");
-
+        if (cnt->conf.native_language == 1) {
+            translate_locale_chg("es"); /* This is a testing only function call*/
+            nls_enabled = 1;
+            setlocale (LC_ALL, "");
+            bindtextdomain ("motion", LOCALEDIR);
+            bind_textdomain_codeset ("motion", "UTF-8");
+            textdomain ("motion");
+        } else {
+            nls_enabled = 0;
+        }
         MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Language: English"));
-
     #else
-        /* Disable native language support */
         nls_enabled = 0;
-
-        /* This avoids a unused function warning */
-        translate_locale_chg("en");
+        (void)cnt;
     #endif
 }
 
diff --git a/src/translate.h b/src/translate.h
@@ -32,7 +32,7 @@ extern int nls_enabled;
 #define _(STRING) translate_text(STRING)
 
 char* translate_text(const char *msgid);
-void translate_init(void);
+void translate_init(struct context *cnt);
 void translate_locale_chg(const char *langcd);
 
 #endif // _INCLUDE_TRANSLATE_H_
diff --git a/src/util.c b/src/util.c
@@ -21,8 +21,8 @@
  *
  */
 
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "logger.h"
 #include "util.h"
 
diff --git a/src/video_bktr.c b/src/video_bktr.c
@@ -22,9 +22,9 @@
  */
 
 /* For rotation */
-#include "translate.h"
 #include "motion.h"
 #include "util.h"
+#include "translate.h"
 #include "logger.h"
 #include "rotate.h"
 #include "video_common.h"
diff --git a/src/video_common.c b/src/video_common.c
@@ -22,8 +22,8 @@
  *                2007 by Angel Carpintero (motiondevelop@gmail.com)
  *
  */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "video_common.h"
diff --git a/src/video_loopback.c b/src/video_loopback.c
@@ -22,8 +22,8 @@
  *    Copyright 2008 by Angel Carpintero (motiondevelop@gmail.com)
  *
  */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 
diff --git a/src/video_v4l2.c b/src/video_v4l2.c
@@ -23,8 +23,8 @@
  *    Refactor/rewrite code:  2018 MrDave
  *
 */
-#include "translate.h"
 #include "motion.h"
+#include "translate.h"
 #include "util.h"
 #include "logger.h"
 #include "rotate.h"

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`-#include "translate.h"`
`25`	`24`	`#include "motion.h"`
	`25`	`+#include "translate.h"`
`26`	`26`	`#include "util.h"`
`27`	`27`	`#include "logger.h"`
`28`	`28`	`#include "dbse.h"`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`*/`
`27`	`27`
`28`		`-#include "translate.h"`
`29`	`28`	`#include "motion.h"`
	`29`	`+#include "translate.h"`
`30`	`30`	`#include "util.h"`
`31`	`31`	`#include "logger.h"`
`32`	`32`	`#include "netcam.h"`