Fix syntax error in named_waypoints.fr.tr

for a cleaner HUD look

i18n.py

@@ -0,0 +1,421 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Script to generate the template file and update the translation files.
+# Copy the script into the mod or modpack root folder and run it there.
+#
+# Copyright (C) 2019 Joachim Stolberg, 2020 FaceDeer, 2020 Louis Royer
+# LGPLv2.1+
+#
+# See https://github.com/minetest-tools/update_translations for
+# potential future updates to this script.
+
+from __future__ import print_function
+import os, fnmatch, re, shutil, errno
+from sys import argv as _argv
+
+# Running params
+params = {"recursive": False,
+    "help": False,
+    "mods": False,
+    "verbose": False,
+    "folders": []
+}
+# Available CLI options
+options = {"recursive": ['--recursive', '-r'],
+    "help": ['--help', '-h'],
+    "mods": ['--installed-mods'],
+    "verbose": ['--verbose', '-v']
+}
+
+# Strings longer than this will have extra space added between
+# them in the translation files to make it easier to distinguish their
+# beginnings and endings at a glance
+doublespace_threshold = 60
+
+def set_params_folders(tab: list):
+    '''Initialize params["folders"] from CLI arguments.'''
+    # Discarding argument 0 (tool name)
+    for param in tab[1:]:
+        stop_param = False
+        for option in options:
+            if param in options[option]:
+                stop_param = True
+                break
+        if not stop_param:
+            params["folders"].append(os.path.abspath(param))
+
+def set_params(tab: list):
+    '''Initialize params from CLI arguments.'''
+    for option in options:
+        for option_name in options[option]:
+            if option_name in tab:
+                params[option] = True
+                break
+
+def print_help(name):
+    '''Prints some help message.'''
+    print(f'''SYNOPSIS
+    {name} [OPTIONS] [PATHS...]
+DESCRIPTION
+    {', '.join(options["help"])}
+        prints this help message
+    {', '.join(options["recursive"])}
+        run on all subfolders of paths given
+    {', '.join(options["mods"])}
+        run on locally installed modules
+    {', '.join(options["verbose"])}
+        add output information
+''')
+
+
+def main():
+    '''Main function'''
+    set_params(_argv)
+    set_params_folders(_argv)
+    if params["help"]:
+        print_help(_argv[0])
+    elif params["recursive"] and params["mods"]:
+        print("Option --installed-mods is incompatible with --recursive")
+    else:
+        # Add recursivity message
+        print("Running ", end='')
+        if params["recursive"]:
+            print("recursively ", end='')
+        # Running
+        if params["mods"]:
+            print(f"on all locally installed modules in {os.path.abspath('~/.minetest/mods/')}")
+            run_all_subfolders("~/.minetest/mods")
+        elif len(params["folders"]) >= 2:
+            print("on folder list:", params["folders"])
+            for f in params["folders"]:
+                if params["recursive"]:
+                    run_all_subfolders(f)
+                else:
+                    update_folder(f)
+        elif len(params["folders"]) == 1:
+            print("on folder", params["folders"][0])
+            if params["recursive"]:
+                run_all_subfolders(params["folders"][0])
+            else:
+                update_folder(params["folders"][0])
+        else:
+            print("on folder", os.path.abspath("./"))
+            if params["recursive"]:
+                run_all_subfolders(os.path.abspath("./"))
+            else:
+                update_folder(os.path.abspath("./"))
+
+#group 2 will be the string, groups 1 and 3 will be the delimiters (" or ')
+#See https://stackoverflow.com/questions/46967465/regex-match-text-in-either-single-or-double-quote
+pattern_lua = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_bracketed = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+
+# Handles "concatenation" .. " of strings"
+pattern_concat = re.compile(r'["\'][\s]*\.\.[\s]*["\']', re.DOTALL)
+
+pattern_tr = re.compile(r'(.+?[^@])=(.*)')
+pattern_name = re.compile(r'^name[ ]*=[ ]*([^ \n]*)')
+pattern_tr_filename = re.compile(r'\.tr$')
+pattern_po_language_code = re.compile(r'(.*)\.po$')
+
+#attempt to read the mod's name from the mod.conf file. Returns None on failure
+def get_modname(folder):
+    try:
+        with open(os.path.join(folder, "mod.conf"), "r", encoding='utf-8') as mod_conf:
+            for line in mod_conf:
+                match = pattern_name.match(line)
+                if match:
+                    return match.group(1)
+    except FileNotFoundError:
+        pass
+    return None
+
+#If there are already .tr files in /locale, returns a list of their names
+def get_existing_tr_files(folder):
+    out = []
+    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+        for name in files:
+            if pattern_tr_filename.search(name):
+                out.append(name)
+    return out
+
+# A series of search and replaces that massage a .po file's contents into
+# a .tr file's equivalent
+def process_po_file(text):
+    # The first three items are for unused matches
+    text = re.sub(r'#~ msgid "', "", text)
+    text = re.sub(r'"\n#~ msgstr ""\n"', "=", text)
+    text = re.sub(r'"\n#~ msgstr "', "=", text)
+    # comment lines
+    text = re.sub(r'#.*\n', "", text)
+    # converting msg pairs into "=" pairs
+    text = re.sub(r'msgid "', "", text)
+    text = re.sub(r'"\nmsgstr ""\n"', "=", text)
+    text = re.sub(r'"\nmsgstr "', "=", text)
+    # various line breaks and escape codes
+    text = re.sub(r'"\n"', "", text)
+    text = re.sub(r'"\n', "\n", text)
+    text = re.sub(r'\\"', '"', text)
+    text = re.sub(r'\\n', '@n', text)
+    # remove header text
+    text = re.sub(r'=Project-Id-Version:.*\n', "", text)
+    # remove double-spaced lines
+    text = re.sub(r'\n\n', '\n', text)
+    return text
+
+# Go through existing .po files and, if a .tr file for that language
+# *doesn't* exist, convert it and create it.
+# The .tr file that results will subsequently be reprocessed so
+# any "no longer used" strings will be preserved.
+# Note that "fuzzy" tags will be lost in this process.
+def process_po_files(folder, modname):
+    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+        for name in files:
+            code_match = pattern_po_language_code.match(name)
+            if code_match == None:
+                continue
+            language_code = code_match.group(1)
+            tr_name = modname + "." + language_code + ".tr"
+            tr_file = os.path.join(root, tr_name)
+            if os.path.exists(tr_file):
+                if params["verbose"]:
+                    print(f"{tr_name} already exists, ignoring {name}")
+                continue
+            fname = os.path.join(root, name)
+            with open(fname, "r", encoding='utf-8') as po_file:
+                if params["verbose"]:
+                    print(f"Importing translations from {name}")
+                text = process_po_file(po_file.read())
+                with open(tr_file, "wt", encoding='utf-8') as tr_out:
+                    tr_out.write(text)
+
+# from https://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python/600612#600612
+# Creates a directory if it doesn't exist, silently does
+# nothing if it already exists
+def mkdir_p(path):
+    try:
+        os.makedirs(path)
+    except OSError as exc: # Python >2.5
+        if exc.errno == errno.EEXIST and os.path.isdir(path):
+            pass
+        else: raise
+
+# Converts the template dictionary to a text to be written as a file
+# dKeyStrings is a dictionary of localized string to source file sets
+# dOld is a dictionary of existing translations and comments from
+# the previous version of this text
+def strings_to_text(dkeyStrings, dOld, mod_name):
+    lOut = [f"# textdomain: {mod_name}\n"]
+    
+    dGroupedBySource = {}
+
+    for key in dkeyStrings:
+        sourceList = list(dkeyStrings[key])
+        sourceList.sort()
+        sourceString = "\n".join(sourceList)
+        listForSource = dGroupedBySource.get(sourceString, [])
+        listForSource.append(key)
+        dGroupedBySource[sourceString] = listForSource
+    
+    lSourceKeys = list(dGroupedBySource.keys())
+    lSourceKeys.sort()
+    for source in lSourceKeys:
+        localizedStrings = dGroupedBySource[source]
+        localizedStrings.sort()
+        lOut.append("")
+        lOut.append(source)
+        lOut.append("")
+        for localizedString in localizedStrings:
+            val = dOld.get(localizedString, {})
+            translation = val.get("translation", "")
+            comment = val.get("comment")
+            if len(localizedString) > doublespace_threshold and not lOut[-1] == "":
+                lOut.append("")
+            if comment != None:
+                lOut.append(comment)
+            lOut.append(f"{localizedString}={translation}")
+            if len(localizedString) > doublespace_threshold:
+                lOut.append("")
+
+
+    unusedExist = False
+    for key in dOld:
+        if key not in dkeyStrings:
+            val = dOld[key]
+            translation = val.get("translation")
+            comment = val.get("comment")
+            # only keep an unused translation if there was translated
+            # text or a comment associated with it
+            if translation != None and (translation != "" or comment):
+                if not unusedExist:
+                    unusedExist = True
+                    lOut.append("\n\n##### not used anymore #####\n")
+                if len(key) > doublespace_threshold and not lOut[-1] == "":
+                    lOut.append("")
+                if comment != None:
+                    lOut.append(comment)
+                lOut.append(f"{key}={translation}")
+                if len(key) > doublespace_threshold:
+                    lOut.append("")
+    return "\n".join(lOut) + '\n'
+
+# Writes a template.txt file
+# dkeyStrings is the dictionary returned by generate_template
+def write_template(templ_file, dkeyStrings, mod_name):
+    # read existing template file to preserve comments
+    existing_template = import_tr_file(templ_file)
+    
+    text = strings_to_text(dkeyStrings, existing_template[0], mod_name)
+    mkdir_p(os.path.dirname(templ_file))
+    with open(templ_file, "wt", encoding='utf-8') as template_file:
+        template_file.write(text)
+
+
+# Gets all translatable strings from a lua file
+def read_lua_file_strings(lua_file):
+    lOut = []
+    with open(lua_file, encoding='utf-8') as text_file:
+        text = text_file.read()
+        #TODO remove comments here
+
+        text = re.sub(pattern_concat, "", text)
+
+        strings = []
+        for s in pattern_lua.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed.findall(text):
+            strings.append(s)
+                
+        for s in strings:
+            s = re.sub(r'"\.\.\s+"', "", s)
+            s = re.sub("@[^@=0-9]", "@@", s)
+            s = s.replace('\\"', '"')
+            s = s.replace("\\'", "'")
+            s = s.replace("\n", "@n")
+            s = s.replace("\\n", "@n")
+            s = s.replace("=", "@=")
+            lOut.append(s)
+    return lOut
+
+# Gets strings from an existing translation file
+# returns both a dictionary of translations
+# and the full original source text so that the new text
+# can be compared to it for changes.
+def import_tr_file(tr_file):
+    dOut = {}
+    text = None
+    if os.path.exists(tr_file):
+        with open(tr_file, "r", encoding='utf-8') as existing_file :
+            # save the full text to allow for comparison
+            # of the old version with the new output
+            text = existing_file.read()
+            existing_file.seek(0)
+            # a running record of the current comment block
+            # we're inside, to allow preceeding multi-line comments
+            # to be retained for a translation line
+            latest_comment_block = None
+            for line in existing_file.readlines():
+                line = line.rstrip('\n')
+                if line[:3] == "###":
+                    # Reset comment block if we hit a header
+                    latest_comment_block = None
+                    continue
+                if line[:1] == "#":
+                    # Save the comment we're inside
+                    if not latest_comment_block:
+                        latest_comment_block = line
+                    else:
+                        latest_comment_block = latest_comment_block + "\n" + line
+                    continue
+                match = pattern_tr.match(line)
+                if match:
+                    # this line is a translated line
+                    outval = {}
+                    outval["translation"] = match.group(2)
+                    if latest_comment_block:
+                        # if there was a comment, record that.
+                        outval["comment"] = latest_comment_block
+                    latest_comment_block = None
+                    dOut[match.group(1)] = outval
+    return (dOut, text)
+
+# Walks all lua files in the mod folder, collects translatable strings,
+# and writes it to a template.txt file
+# Returns a dictionary of localized strings to source file sets
+# that can be used with the strings_to_text function.
+def generate_template(folder, mod_name):
+    dOut = {}
+    for root, dirs, files in os.walk(folder):
+        for name in files:
+            if fnmatch.fnmatch(name, "*.lua"):
+                fname = os.path.join(root, name)
+                found = read_lua_file_strings(fname)
+                if params["verbose"]:
+                    print(f"{fname}: {str(len(found))} translatable strings")
+
+                for s in found:
+                    sources = dOut.get(s, set())
+                    sources.add(f"### {os.path.basename(fname)} ###")
+                    dOut[s] = sources
+                    
+    if len(dOut) == 0:
+        return None
+    templ_file = os.path.join(folder, "locale/template.txt")
+    write_template(templ_file, dOut, mod_name)
+    return dOut
+
+# Updates an existing .tr file, copying the old one to a ".old" file
+# if any changes have happened
+# dNew is the data used to generate the template, it has all the
+# currently-existing localized strings
+def update_tr_file(dNew, mod_name, tr_file):
+    if params["verbose"]:
+        print(f"updating {tr_file}")
+
+    tr_import = import_tr_file(tr_file)
+    dOld = tr_import[0]
+    textOld = tr_import[1]
+
+    textNew = strings_to_text(dNew, dOld, mod_name)
+
+    if textOld and textOld != textNew:
+        print(f"{tr_file} has changed.")
+        shutil.copyfile(tr_file, f"{tr_file}.old")
+
+    with open(tr_file, "w", encoding='utf-8') as new_tr_file:
+        new_tr_file.write(textNew)
+
+# Updates translation files for the mod in the given folder
+def update_mod(folder):
+    modname = get_modname(folder)
+    if modname is not None:
+        process_po_files(folder, modname)
+        print(f"Updating translations for {modname}")
+        data = generate_template(folder, modname)
+        if data == None:
+            print(f"No translatable strings found in {modname}")
+        else:
+            for tr_file in get_existing_tr_files(folder):
+                update_tr_file(data, modname, os.path.join(folder, "locale/", tr_file))
+    else:
+        print("Unable to find modname in folder " + folder)
+
+# Determines if the folder being pointed to is a mod or a mod pack
+# and then runs update_mod accordingly
+def update_folder(folder):
+    is_modpack = os.path.exists(os.path.join(folder, "modpack.txt")) or os.path.exists(os.path.join(folder, "modpack.conf"))
+    if is_modpack:
+        subfolders = [f.path for f in os.scandir(folder) if f.is_dir()]
+        for subfolder in subfolders:
+            update_mod(subfolder + "/")
+    else:
+        update_mod(folder)
+    print("Done.")
+
+def run_all_subfolders(folder):
+    for modfolder in [f.path for f in os.scandir(folder) if f.is_dir()]:
+        update_folder(modfolder + "/")
+
+
+main()

init.lua

@@ -32,7 +32,7 @@ named_waypoints.register_named_waypoints = function(waypoints_type, waypoints_de
 	waypoint_defs[waypoints_type] = waypoints_def
 	player_huds[waypoints_type] = {}
 
-	local areastore_filename = worldpath.."/named_waypoints_".. waypoints_type ..".txt"
+	local areastore_filename = worldpath.."/named_waypoints_"..  string.gsub(waypoints_type, ":", "_") ..".txt"
 	local area_file = io.open(areastore_filename, "r")
 	local areastore = AreaStore()
 	if area_file then
@@ -43,7 +43,7 @@ named_waypoints.register_named_waypoints = function(waypoints_type, waypoints_de
 end
 
 local function save(waypoints_type)
-	local areastore_filename = worldpath.."/named_waypoints_".. waypoints_type ..".txt"
+	local areastore_filename = worldpath.."/named_waypoints_".. string.gsub(waypoints_type, ":", "_") ..".txt"
 	local areastore = waypoint_areastores[waypoints_type]
 	if areastore then
 		areastore:to_file(areastore_filename)
@@ -172,7 +172,8 @@ local function add_hud_marker(waypoints_type, player, player_name, pos, label, c
 		name = label,
 		text = "m",
 		number = color,
-		world_pos = pos})
+		world_pos = pos,
+		precision = 1})
 	waypoints[pos_hash] = hud_id
 end
 
@@ -393,15 +394,56 @@ named_waypoints.default_discovery_popup = function(player, pos, data, waypoint_d
 	local discovery_name = data.name or waypoint_def.default_name
 	local discovery_note = S("You've discovered @1", discovery_name)
 	local formspec = "formspec_version[2]" ..
-		"size[5,2]" ..
+		"size[10,2]" ..
 		"label[1.25,0.75;" .. minetest.formspec_escape(discovery_note) ..
-		"]button_exit[1.0,1.25;3,0.5;btn_ok;".. S("OK") .."]"
+		"]button_exit[3.5,1.25;3,0.5;btn_ok;".. S("OK") .."]"
 	minetest.show_formspec(player_name, "named_waypoints:discovery_popup", formspec)
 	minetest.chat_send_player(player_name, discovery_note)
 	minetest.log("action", "[named_waypoints] " .. player_name .. " discovered " .. discovery_name)
 	minetest.sound_play({name = "named_waypoints_chime01", gain = 0.25}, {to_player=player_name})
 end
 
+local player_log_formspec_open
+
+if minetest.get_modpath("personal_log") and personal_log ~= nil then
+	player_log_formspec_open = {}
+
+	named_waypoints.default_discovery_popup = function(player, pos, data, waypoint_def)
+		local player_name = player:get_player_name()
+		local discovery_name = data.name or waypoint_def.default_name
+		local discovery_note = S("You've discovered @1", discovery_name)
+		local formspec = "formspec_version[2]" ..
+			"size[10,2]" ..
+			"label[1.25,0.75;" .. minetest.formspec_escape(discovery_note) ..
+			"]button_exit[2.0,1.25;3,0.5;btn_ok;".. S("OK") .."]" ..
+			"button_exit[5.0,1.25;3,0.5;btn_log;"..S("Log location").."]"
+	
+		minetest.show_formspec(player_name, "named_waypoints:discovery_popup_log", formspec)
+		minetest.chat_send_player(player_name, discovery_note)
+		minetest.log("action", "[named_waypoints] " .. player_name .. " discovered " .. discovery_name)
+		minetest.sound_play({name = "named_waypoints_chime01", gain = 0.25}, {to_player=player_name})
+		player_log_formspec_open[player_name] = {data=data, waypoint_def=waypoint_def, pos=pos}
+	end
+	
+	minetest.register_on_player_receive_fields(function(player, formname, fields)
+		if formname ~= "named_waypoints:discovery_popup_log" then
+			return
+		end
+		local player_name = player:get_player_name()
+		local waypoint_data = player_log_formspec_open[player_name]
+		if not waypoint_data then
+			return
+		end
+		
+		if fields.btn_log then
+			local discovery_name = waypoint_data.data.name or waypoint_data.waypoint_def.default_name
+			personal_log.add_location_entry(player_name, discovery_name, waypoint_data.pos)
+			minetest.chat_send_player(player_name, S("Location of @1 added to your personal log", discovery_name))
+		end
+		
+		player_log_formspec_open[player_name] = nil		
+	end)
+end
 
 ------------------------------------------------------------------------------------------------------------------
 --- Admin commands
@@ -416,8 +458,9 @@ local function get_formspec(player_name)
 
 	local formspec = {
 		"formspec_version[2]"
-		.."size[8,9]"
-		.."label[0.5,0.6;Type:]dropdown[1.25,0.5;2,0.25;type_select;"
+		.."size[8,10]"
+		.."button_exit[7.0,0.25;0.5,0.5;close;X]"
+		.."label[0.5,0.6;"..S("Type:").."]dropdown[2,0.35;4,0.5;type_select;"
 	}
 	
 	local types = {}
@@ -434,7 +477,7 @@ local function get_formspec(player_name)
 		table.insert(types, waypoint_type)
 	end
 	local selected_def = waypoint_defs[state.selected_type]
-	formspec[#formspec+1] = table.concat(types, ",") .. ";"..dropdown_selected_index.."]"
+	formspec[#formspec+1] = table.concat(types, ",") .. ";"..(dropdown_selected_index or 0).."]"
 	
 	formspec[#formspec+1] = "tablecolumns[text;text;text]table[0.5,1.0;7,4;waypoint_table;"
 	local areastore = waypoint_areastores[state.selected_type]
@@ -487,17 +530,17 @@ local function get_formspec(player_name)
 	state.selected_pos = state.selected_pos or {x=0,y=0,z=0}
 	
 	formspec[#formspec+1] = "container[0.5,5.25]"
-		.."label[0,0.15;X]field[0.25,0;1,0.25;pos_x;;"..state.selected_pos.x.."]"
-		.."label[1.5,0.15;Y]field[1.75,0;1,0.25;pos_y;;"..state.selected_pos.y.."]"
-		.."label[3.0,0.15;Z]field[3.25,0;1,0.25;pos_z;;"..state.selected_pos.z.."]"
+		.."label[0,0.15;X]field[0.25,-0.15;1,0.5;pos_x;;"..state.selected_pos.x.."]"
+		.."label[1.5,0.15;Y]field[1.75,-0.15;1,0.5;pos_y;;"..state.selected_pos.y.."]"
+		.."label[3.0,0.15;Z]field[3.25,-0.15;1,0.5;pos_z;;"..state.selected_pos.z.."]"
 		.."container_end[]"
 
 	formspec[#formspec+1] = "textarea[0.5,5.75;7,2.25;waypoint_data;;".. minetest.formspec_escape(selected_data_string) .."]"
 
 	formspec[#formspec+1] = "container[0.5,8.25]"
-		.."button[0,0;1,0.5;teleport;"..S("Teleport").."]button[1,0;1,0.5;save;"..S("Save").."]"
-		.."button[2,0;1,0.5;rename;"..S("Rename").."]field[3,0;2,0.5;waypoint_name;;" .. selected_name .."]"
-		.."button[5,0;1,0.5;create;"..S("New").."]button[6,0;1,0.5;delete;"..S("Delete").."]"
+		.."button[0,0;3,0.5;teleport;"..S("Teleport").."]button[3.5,0;3,0.5;save;"..S("Save").."]"
+		.."button[0,0.5;3,0.5;rename;"..S("Rename").."]field[3.5,0.5;3,0.5;waypoint_name;;" .. selected_name .."]"
+		.."button[0,1;3,0.5;create;"..S("New").."]button[3.5,1;3,0.5;delete;"..S("Delete").."]"
 		.."container_end[]"
 
 	return table.concat(formspec)
@@ -518,6 +561,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	if formname ~= "named_waypoints:server_controls" then
 		return
 	end
+
+	if fields.close then
+		return
+	end
+	
 	local player_name = player:get_player_name()
 	if not minetest.check_player_privs(player_name, {server = true}) then
 		minetest.chat_send_player(player_name, S("This command is for server admins only."))
@@ -527,19 +575,22 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	local refresh = false
 	local state = formspec_state[player_name]
 	if fields.type_select then
-		formspec_state[player_name].selected_type = fields.type_select
+		state.selected_type = fields.type_select
 		refresh = true
 	end
 	
 	if fields.waypoint_table then
 		local table_event = minetest.explode_table_event(fields.waypoint_table)
 		if table_event.type == "CHG" then
-			formspec_state[player_name].row_index = table_event.row
+			state.row_index = table_event.row
 			refresh = true
 		end
 	end
 	
 	if fields.save then
+		if state.selected_id == nil then
+			return
+		end
 		local deserialized = minetest.deserialize(fields.waypoint_data)
 		local pos_x = tonumber(fields.pos_x)
 		local pos_y = tonumber(fields.pos_y)
@@ -561,6 +612,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end
 	
 	if fields.delete then
+		if state.selected_id == nil then
+			return
+		end
 		local areastore = waypoint_areastores[state.selected_type]
 		areastore:remove_area(state.selected_id)
 		save(state.selected_type)
@@ -583,6 +637,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end	
 	
 	if fields.rename then
+		if state.selected_id == nil then
+			return
+		end
 		local areastore = waypoint_areastores[state.selected_type]
 		local area = areastore:get_area(state.selected_id, true, true)
 		local data = minetest.deserialize(area.data)
@@ -637,4 +694,4 @@ minetest.register_chatcommand("named_waypoints_undiscover_all", {
 		end
 		set_all_discovered(name, param, nil)
 	end,
-})
+})

locale/named_waypoints.fr.tr

@@ -0,0 +1,43 @@
+# textdomain: named_waypoints
+
+
+### init.lua ###
+
+#button label
+Delete=Supprimer
+#warning that incorrect data was entered for a waypoint in the UI
+Invalid syntax.=Syntaxe incorrecte.
+#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
+Location of @1 added to your personal log=Emplacement de @1 ajouté à votre journal personnel
+#WARNING: AUTOTRANSLATED BY GOOGLE TRANSLATE
+Log location=Emplacement du journal
+#button label
+New=Nouveau
+#button label
+OK=OK
+#chat command help text
+Open server controls for named_waypoints=Ouvre le panneau de contrôle serveur pour named_waypoints
+#chat command error message
+Please provide a valid waypoint type as a parameter=Veuillez fournir un type de balise en paramètre.
+#button label
+Rename=Renommer
+#button label
+Save=Sauvegarder
+#chat command help text
+Set all waypoints of a type as discovered by you=Marquer toutes les balises de ce type comme découvertes par vous.
+#chat command help text
+Set all waypoints of a type as not discovered by you=Marqué toutes les balises de ce type comme non découverte par vous.
+#button label
+Teleport=Se téléporter
+#error message for when trying to create a waypoint where one already exists
+There's already a waypoint there.=Il y a déjà une balise ici.
+#chat command error message
+This command is for server admins only.=Cette commande est réservée aux administrateurs du serveur exclusivement.
+#Type of waypoint label
+Type:=Type :
+#player chat
+Waypoint updated.=Balise mise à jour.
+#text of the default popup shown when a player discovers a waypoint
+You've discovered @1=Vous avez découvert @1.
+#chat command parameter help
+waypoint type=type de balise

locale/template.pot

@@ -1,65 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-25 00:50-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: init.lua:368
-msgid "You've discovered @1"
-msgstr ""
-
-#: init.lua:372
-msgid "OK"
-msgstr ""
-
-#: init.lua:468
-msgid "Open server controls for named_waypoints"
-msgstr ""
-
-#: init.lua:471
-#: init.lua:484
-msgid "This command is for server admins only."
-msgstr ""
-
-#: init.lua:517
-msgid "Waypoint updated."
-msgstr ""
-
-#: init.lua:519
-msgid "Invalid syntax."
-msgstr ""
-
-#: init.lua:538
-msgid "There's already a waypoint there."
-msgstr ""
-
-#: init.lua:568
-msgid "Set all waypoints of a type as discovered by you"
-msgstr ""
-
-#: init.lua:569
-#: init.lua:582
-msgid "waypoint type"
-msgstr ""
-
-#: init.lua:573
-#: init.lua:586
-msgid "Please provide a valid waypoint type as a parameter"
-msgstr ""
-
-#: init.lua:581
-msgid "Set all waypoints of a type as not discovered by you"
-msgstr ""

locale/template.txt

@@ -0,0 +1,41 @@
+# textdomain: named_waypoints
+
+
+### init.lua ###
+
+#button label
+Delete=
+#warning that incorrect data was entered for a waypoint in the UI
+Invalid syntax.=
+Location of @1 added to your personal log=
+Log location=
+#button label
+New=
+#button label
+OK=
+#chat command help text
+Open server controls for named_waypoints=
+#chat command error message
+Please provide a valid waypoint type as a parameter=
+#button label
+Rename=
+#button label
+Save=
+#chat command help text
+Set all waypoints of a type as discovered by you=
+#chat command help text
+Set all waypoints of a type as not discovered by you=
+#button label
+Teleport=
+#error message for when trying to create a waypoint where one already exists
+There's already a waypoint there.=
+#chat command error message
+This command is for server admins only.=
+#Type of waypoint label
+Type:=
+#player chat
+Waypoint updated.=
+#text of the default popup shown when a player discovers a waypoint
+You've discovered @1=
+#chat command parameter help
+waypoint type=

locale/update.bat

@@ -1,6 +0,0 @@
-@echo off
-setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
-cd ..
-set LIST=
-for /r %%X in (*.lua) do set LIST=!LIST! %%X
-..\intllib\tools\xgettext.bat %LIST%

mod.conf

@@ -1,2 +1,3 @@
 name = named_waypoints
-description = A library mod for managing waypoints shown in player HUDs that can be discovered by exploration.
+description = A library mod for managing waypoints shown in player HUDs that can be discovered by exploration.
+optional_depends = personal_log

readme.md

@@ -85,6 +85,10 @@ Caution: This interface lets you access the guts of the data stored for each way
 
 "``/named_waypoints_discover_all <waypoints_type>``" and "``/named_waypoints_undiscover_all <waypoints_type>``" will set all existing waypoints of the provided type to be either discovered or not discovered by you. It can be useful for a server administrator to "know all and see all" as it were. Note that visibility item and range limitations still apply.
 
+## personal_log integration
+
+If you have the personal_log mod installed, the default waypoint-discovery notification popup will include an option to log the location of the just-discovered waypoint. It will create a log entry for that player with the waypoint's name as its content.
+
 ## License
 
 This mod is released under the MIT license.