Localization: updates

- webui.pot and *.po translation updates
- *.po & *.mo update automation adjustments

.gitignore

@@ -2,3 +2,6 @@ composer.lock
 config.ini
 *.swp
 *.cache
+Makefile
+config.log
+config.status

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = module/Application/language
+SUBDIRS = module/Application/language public/js/locale
 
 install: install-am
 	mkdir -p $(DESTDIR)$(pkgdatadir)

Makefile.in

@@ -262,7 +262,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = module/Application/language
+SUBDIRS = module/Application/language public/js/locale
 all: all-recursive
 
 .SUFFIXES:

configure

@@ -2353,7 +2353,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile module/Application/language/Makefile"
+ac_config_files="$ac_config_files Makefile module/Application/language/Makefile public/js/locale/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -3074,6 +3074,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "module/Application/language/Makefile") CONFIG_FILES="$CONFIG_FILES module/Application/language/Makefile" ;;
+    "public/js/locale/Makefile") CONFIG_FILES="$CONFIG_FILES public/js/locale/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.ac

@@ -23,5 +23,5 @@ fi
 AC_SUBST(HTTPD_CONF)
 
 AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_FILES(Makefile module/Application/language/Makefile)
+AC_CONFIG_FILES(Makefile module/Application/language/Makefile public/js/locale/Makefile)
 AC_OUTPUT

module/Application/language/Makefile.am

@@ -2,15 +2,15 @@ all: update-pot update-all msgfmt-all
 
 update-pot:
 	@(echo 'Updating webui.pot ...';)
-	@(find ../../ -name '*.ph*' | xargs xgettext --keyword=translate -L PHP --from-code=UTF-8 -o webui.pot;)
+	@(find ../../../ -regextype posix-egrep -regex '.*(php|phtml)$$' | grep -v vendor | grep -v tests | xargs xgettext --keyword=translate -L PHP --from-code=UTF-8 -o webui.pot;)
 
 update-po: $(PO)
 	@(echo 'Updating $(PO) file ...';)
-	@(msgmerge -U $(PO) webui.pot);
+	@(msgmerge --backup=none -U $(PO) webui.pot)
 
 update-all: webui.pot
 	@(echo 'Updating all *.po files ...';)
-	@(for i in de_DE en_EN fr_FR ru_RU; do msgmerge -U $$i.po $< && touch $$i.po; done;)
+	@(for i in de_DE en_EN fr_FR ru_RU; do msgmerge --backup=none -U $$i.po $< && touch $$i.po; done;)
 
 msgfmt-all: webui.pot
 	@(echo 'Generating all *.mo files ...';)

module/Application/language/Makefile.in

@@ -368,11 +368,11 @@ all: update-pot update-all msgfmt-all
 
 update-pot:
 	@(echo 'Updating webui.pot ...';)
-	@(find ../../ -name '*.ph*' | xargs xgettext --keyword=translate -L PHP --from-code=UTF-8 -o webui.pot;)
+	@(find ../../../ -regextype posix-egrep -regex '.*(php|phtml)$$' | grep -v vendor | grep -v tests | xargs xgettext --keyword=translate -L PHP --from-code=UTF-8 -o webui.pot;)
 
 update-po: $(PO)
 	@(echo 'Updating $(PO) file ...';)
-	@(msgmerge --backup=none -U $(PO) webui.pot);
+	@(msgmerge --backup=none -U $(PO) webui.pot)
 
 update-all: webui.pot
 	@(echo 'Updating all *.po files ...';)