first commit

tools/findtext.lua

@@ -0,0 +1,142 @@
+#! /usr/bin/env lua
+
+local me = arg[0]:gsub(".*[/\\](.*)$", "%1")
+
+local function err(fmt, ...)
+	io.stderr:write(("%s: %s\n"):format(me, fmt:format(...)))
+	os.exit(1)
+end
+
+local output
+local inputs = { }
+local lang
+local author
+
+local i = 1
+
+local function usage()
+	print([[
+Usage: ]]..me..[[ [OPTIONS] FILE...
+
+Extract translatable strings from the given FILE(s).
+
+Available options:
+  -h,--help         Show this help screen and exit.
+  -o,--output X     Set output file (default: stdout).
+  -a,--author X     Set author.
+  -l,--lang X       Set language name.
+]])
+	os.exit(0)
+end
+
+while i <= #arg do
+	local a = arg[i]
+	if (a == "-h") or (a == "--help") then
+		usage()
+	elseif (a == "-o") or (a == "--output") then
+		i = i + 1
+		if i > #arg then
+			err("missing required argument to `%s'", a)
+		end
+		output = arg[i]
+	elseif (a == "-a") or (a == "--author") then
+		i = i + 1
+		if i > #arg then
+			err("missing required argument to `%s'", a)
+		end
+		author = arg[i]
+	elseif (a == "-l") or (a == "--lang") then
+		i = i + 1
+		if i > #arg then
+			err("missing required argument to `%s'", a)
+		end
+		lang = arg[i]
+	elseif a:sub(1, 1) ~= "-" then
+		table.insert(inputs, a)
+	else
+		err("unrecognized option `%s'", a)
+	end
+	i = i + 1
+end
+
+if #inputs == 0 then
+	err("no input files")
+end
+
+local outfile = io.stdout
+
+local function printf(fmt, ...)
+	outfile:write(fmt:format(...))
+end
+
+if output then
+	local e
+	outfile, e = io.open(output, "w")
+	if not outfile then
+		err("error opening file for writing: %s", e)
+	end
+end
+
+if author or lang then
+	outfile:write("\n")
+end
+
+if lang then
+	printf("# Language: %s\n", lang)
+end
+
+if author then
+	printf("# Author: %s\n", author)
+end
+
+if author or lang then
+	outfile:write("\n")
+end
+
+local escapes = {
+	["\n"] = "\\n",
+	["="] = "\\=",
+	["\\"] = "\\\\",
+}
+
+local function escape(s)
+	return s:gsub("[\\\n=]", escapes)
+end
+
+local messages = { }
+
+for _, file in ipairs(inputs) do
+	local infile, e = io.open(file, "r")
+	if infile then
+		for line in infile:lines() do
+			for s in line:gmatch('S%("([^"]*)"') do
+				table.insert(messages, s)
+			end
+		end
+		infile:close()
+	else
+		io.stderr:write(("%s: WARNING: error opening file: %s\n"):format(me, e))
+	end
+end
+
+table.sort(messages)
+
+local last_msg
+
+for _, msg in ipairs(messages) do
+	if msg ~= last_msg then
+		printf("%s =\n", escape(msg))
+	end
+	last_msg = msg
+end
+
+if output then
+	outfile:close()
+end
+
+--[[
+TESTS:
+S("foo") S("bar")
+S("bar")
+S("foo")
+]]

tools/updatetext.lua

@@ -0,0 +1,131 @@
+#! /usr/bin/env lua
+
+local basedir = ""
+if arg[0]:find("[/\\]") then
+	basedir = arg[0]:gsub("(.*[/\\]).*$", "%1"):gsub("\\", "/")
+end
+if basedir == "" then basedir = "./" end
+
+-- Required by load_strings()
+function string.trim(s) -- luacheck: ignore
+	return s:gsub("^%s*(.-)%s*$", "%1")
+end
+
+dofile(basedir.."/../lib.lua")
+
+local me = arg[0]:gsub(".*[/\\](.*)$", "%1")
+
+local function err(fmt, ...)
+	io.stderr:write(("%s: %s\n"):format(me, fmt:format(...)))
+	os.exit(1)
+end
+
+local output, outfile, template
+local catalogs = { }
+
+local function usage()
+	print([[
+Usage: ]]..me..[[ [OPTIONS] TEMPLATE CATALOG...
+
+Update a catalog with new strings from a template.
+
+Available options:
+  -h,--help         Show this help screen and exit.
+  -o,--output X     Set output file (default: stdout).
+
+Messages in the template that are not on the catalog are added to the
+catalog at the end.
+
+This tool also checks messages that are in the catalog but not in the
+template, and reports such lines. It's up to the user to remove such
+lines, if so desired.
+]])
+	os.exit(0)
+end
+
+local i = 1
+
+while i <= #arg do
+	local a = arg[i]
+	if (a == "-h") or (a == "--help") then
+		usage()
+	elseif (a == "-o") or (a == "--output") then
+		i = i + 1
+		if i > #arg then
+			err("missing required argument to `%s'", a)
+		end
+		output = arg[i]
+	elseif a:sub(1, 1) ~= "-" then
+		if not template then
+			template = a
+		else
+			table.insert(catalogs, a)
+		end
+	else
+		err("unrecognized option `%s'", a)
+	end
+	i = i + 1
+end
+
+if not template then
+	err("no template specified")
+elseif #catalogs == 0 then
+	err("no catalogs specified")
+end
+
+local f, e = io.open(template, "r")
+if not f then
+	err("error opening template: %s", e)
+end
+
+local escapes = { ["\n"] = "\\n", ["="] = "\\=", ["\\"] = "\\\\", }
+local function escape(s)
+	return s:gsub("[\\\n=]", escapes)
+end
+
+if output then
+	outfile, e = io.open(output, "w")
+	if not outfile then
+		err("error opening file for writing: %s", e)
+	end
+end
+
+local template_msgs = intllib.load_strings(template)
+
+for _, file in ipairs(catalogs) do
+	print("Processing: "..file)
+	local catalog_msgs = intllib.load_strings(file)
+	local dirty_lines = { }
+	if catalog_msgs then
+		-- Add new entries from template.
+		for k in pairs(template_msgs) do
+			if not catalog_msgs[k] then
+				print("NEW: "..k)
+				table.insert(dirty_lines, escape(k).." =")
+			end
+		end
+		-- Check for old messages.
+		for k, v in pairs(catalog_msgs) do
+			if not template_msgs[k] then
+				print("OLD: "..k)
+				table.insert(dirty_lines, "OLD: "..escape(k).." = "..escape(v))
+			end
+		end
+		if #dirty_lines > 0 then
+			local outf
+			outf, e = io.open(file, "a+")
+			if outf then
+				outf:write("\n")
+				for _, line in ipairs(dirty_lines) do
+					outf:write(line)
+					outf:write("\n")
+				end
+				outf:close()
+			else
+				io.stderr:write(("%s: WARNING: cannot write: %s\n"):format(me, e))
+			end
+		end
+	else
+		io.stderr:write(("%s: WARNING: could not load catalog\n"):format(me))
+	end
+end

tools/xgettext.bat

@@ -0,0 +1,33 @@
+@echo off
+setlocal
+
+set me=%~n0
+
+rem # Uncomment the following line if gettext is not in your PATH.
+rem # Value must be absolute and end in a backslash.
+rem set gtprefix=C:\path\to\gettext\bin\
+
+if "%1" == "" (
+	echo Usage: %me% FILE... 1>&2
+	exit 1
+)
+
+set xgettext=%gtprefix%xgettext.exe
+set msgmerge=%gtprefix%msgmerge.exe
+
+md locale > nul 2>&1
+echo Generating template... 1>&2
+echo %xgettext% --from-code=UTF-8 -kS -kNS:1,2 -k_ -o locale/template.pot %*
+%xgettext% --from-code=UTF-8 -kS -kNS:1,2 -k_ -o locale/template.pot %*
+if %ERRORLEVEL% neq 0 goto done
+
+cd locale
+
+for %%f in (*.po) do (
+	echo Updating %%f... 1>&2
+	%msgmerge% --update %%f template.pot
+)
+
+echo DONE! 1>&2
+
+:done

tools/xgettext.sh

@@ -0,0 +1,27 @@
+#! /bin/bash
+
+me=$(basename "${BASH_SOURCE[0]}");
+
+if [[ $# -lt 1 ]]; then
+	echo "Usage: $me FILE..." >&2;
+	exit 1;
+fi
+
+mkdir -p locale;
+echo "Generating template..." >&2;
+xgettext --from-code=UTF-8 \
+		--keyword=S \
+		--keyword=NS:1,2 \
+		--keyword=N_ \
+		--add-comments='Translators:' \
+		--add-location=file \
+		-o locale/template.pot \
+		"$@" \
+		|| exit;
+
+find locale -name '*.po' -type f | while read -r file; do
+	echo "Updating $file..." >&2;
+	msgmerge --update "$file" locale/template.pot;
+done
+
+echo "DONE!" >&2;