build: embed lmo in the build process

2 files changed, 7 insertions, 57 deletions

diff --git a/build/i18n-po2lua.pl b/build/i18n-po2lua.pl
index c57198fd5..5129055ff 100755
--- a/build/i18n-po2lua.pl
+++ b/build/i18n-po2lua.pl
@@ -10,67 +10,17 @@ if( ! -d $target_dir )
 	system('mkdir', '-p', $target_dir);
 }
 
-
-my %target_strings;
-
-
 if( open F, "find $source_dir -type f -name '*.po' |" )
 {
 	while( chomp( my $file = readline F ) )
 	{
-		if( open L, "< $file" )
-		{
-			my $content = 0;
-			my ( $lang, $basename ) = $file =~ m{.+/(\w+)/([^/]+)\.po$};
-			$lang = lc $lang;
-			$lang =~ s/_/-/g;
-			
-			if( open D, "> $target_dir/$basename.$lang.lua" )
-			{
-				printf "Generating %-40s ", "$target_dir/$basename.$lang.lua";
-
-				my ( $k, $v );
-
-				while( chomp( my $line = readline L ) || ( defined($k) && defined($v) ) )
-				{
-					if( $line =~ /^msgid "(.+)"/ )
-					{
-						$k = $1;
-					}
-					elsif( $k && $line =~ /^msgstr "(.*)"/ )
-					{
-						$v = $1;
-					}
-					elsif( $k && defined($v) && $line =~ /^"(.+)"/ )
-					{
-						$v .= $1;
-					}
-					else
-					{
-						if( $k && defined($v) && length($v) > 0 )
-						{
-							$v =~ s/\\(['"\\])/$1/g;
-							$v =~ s/(['\\])/\\$1/g;
-
-							printf D "%s='%s'\n", $k, $v;
-							$content++;
-						}
-		
-						$k = $v = undef;
-					}
-				}
-
-				print $content ? "done ($content strings)\n" : "empty\n";
-
-				close D;
-
-
-				unlink("$target_dir/$basename.$lang.lua")
-					unless( $content > 0 );
-			}
+		my ( $lang, $basename ) = $file =~ m{.+/(\w+)/([^/]+)\.po$};
+		$lang = lc $lang;
+		$lang =~ s/_/-/g;
 
-			close L;
-		}
+		printf "Generating %-40s ", "$target_dir/$basename.$lang.lmo";
+		system("./build/po2lmo", $file, "$target_dir/$basename.$lang.lmo");
+		print ( -f "$target_dir/$basename.$lang.lmo" ? "done\n" : "empty\n" );
 	}
 
 	close F;
diff --git a/build/module.mk b/build/module.mk
index 569de101d..8d64d6bb4 100644
--- a/build/module.mk
+++ b/build/module.mk
@@ -27,7 +27,7 @@ luasource:
   ifneq ($(PO),)
 	mkdir -p dist$(LUCI_I18NDIR)
 	for file in $(PO); do \
-	  cp $(HOST)/lua-po/$$file.$(if $(PO_LANG),$(PO_LANG),*).lua dist$(LUCI_I18NDIR)/ 2>/dev/null || true; \
+	  cp $(HOST)/lua-po/$$file.$(if $(PO_LANG),$(PO_LANG),*).* dist$(LUCI_I18NDIR)/ 2>/dev/null || true; \
 	done
   endif