zh trans

* fix the problem of privs: gmarks and normal marks privs reversed
* add `list` and `delete` subcommand
* Vocab fix on the `override` command description

README.md

@@ -1,2 +1,7 @@
 # pos_marker
-Minetest mod to make mark to some places, or even teleport to it.
+Minetest mod to make mark to some places, or even teleport to it.\
+## Install
+You need to instal these mod:
+ - `pos_marker` (This mod)
+ - `subcommands` (https://github.com/Emojigit/subcommands)
+then, follow the guide at https://wiki.minetest.net/Installing_Mods to install these mods.

i18n.py

@@ -0,0 +1,476 @@
+#!/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
+from sys import stderr as _stderr
+
+# Running params
+params = {"recursive": False,
+    "help": False,
+    "mods": False,
+    "verbose": False,
+    "folders": [],
+    "no-old-file": False,
+    "break-long-lines": False,
+    "sort": False,
+    "print-source": False,
+    "truncate-unused": False,
+}
+# Available CLI options
+options = {"recursive": ['--recursive', '-r'],
+    "help": ['--help', '-h'],
+    "mods": ['--installed-mods', '-m'],
+    "verbose": ['--verbose', '-v'],
+    "no-old-file": ['--no-old-file', '-O'],
+    "break-long-lines": ['--break-long-lines', '-b'],
+    "sort": ['--sort', '-s'],
+    "print-source": ['--print-source', '-p'],
+    "truncate-unused": ['--truncate-unused', '-t'],
+}
+
+# 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 = 80
+
+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["no-old-file"])}
+        do not create *.old files
+    {', '.join(options["sort"])}
+        sort output strings alphabetically
+    {', '.join(options["break-long-lines"])}
+        add extra line breaks before and after long strings
+    {', '.join(options["print-source"])}
+	add comments denoting the source file
+    {', '.join(options["verbose"])}
+        add output information
+    {', '.join(options["truncate-unused"])}
+        delete unused strings from files
+''')
+
+
+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.expanduser('~/.minetest/mods/')}")
+            run_all_subfolders(os.path.expanduser("~/.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_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_bracketed_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+pattern_lua_bracketed_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\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 or folder name. 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:
+        if not os.path.isfile(os.path.join(folder, "modpack.txt")):
+            folder_name = os.path.basename(folder)
+            # Special case when run in Minetest's builtin directory
+            if folder_name == "builtin":
+                return "__builtin"
+            else:
+                return folder_name
+        else:
+            return None
+    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 = f'{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, header_comments):
+    lOut = [f"# textdomain: {mod_name}"]
+    if header_comments is not None:
+        lOut.append(header_comments)
+    
+    dGroupedBySource = {}
+
+    for key in dkeyStrings:
+        sourceList = list(dkeyStrings[key])
+        if params["sort"]:
+            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]
+        if params["sort"]:
+            localizedStrings.sort()
+        if params["print-source"]:
+            if lOut[-1] != "":
+                lOut.append("")
+            lOut.append(source)
+        for localizedString in localizedStrings:
+            val = dOld.get(localizedString, {})
+            translation = val.get("translation", "")
+            comment = val.get("comment")
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold and not lOut[-1] == "":
+                lOut.append("")
+            if comment != None and comment != "" and not comment.startswith("# textdomain:"):
+                lOut.append(comment)
+            lOut.append(f"{localizedString}={translation}")
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold:
+                lOut.append("")
+
+
+    unusedExist = False
+    if not params["truncate-unused"]:
+        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 params["break-long-lines"] and len(key) > doublespace_threshold and not lOut[-1] == "":
+                        lOut.append("")
+                    if comment != None:
+                        lOut.append(comment)
+                    lOut.append(f"{key}={translation}")
+                    if params["break-long-lines"] and 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, existing_template[2])
+    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_s.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed_s.findall(text):
+            strings.append(s)
+        for s in pattern_lua_fs.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed_fs.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.
+# Returns also header comments in the third return value.
+def import_tr_file(tr_file):
+    dOut = {}
+    text = None
+    header_comment = 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.startswith("###"):
+                    if header_comment is None and not latest_comment_block is None:
+                        # Save header comments
+                        header_comment = latest_comment_block
+                        # Strip textdomain line
+                        tmp_h_c = ""
+                        for l in header_comment.split('\n'):
+                            if not l.startswith("# textdomain:"):
+                                tmp_h_c += l + '\n'
+                        header_comment = tmp_h_c
+
+                    # Reset comment block if we hit a header
+                    latest_comment_block = None
+                    continue
+                elif line.startswith("#"):
+                    # 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, header_comment)
+
+# 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, tr_import[2])
+
+    if textOld and textOld != textNew:
+        print(f"{tr_file} has changed.")
+        if not params["no-old-file"]:
+            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(f"\033[31mUnable to find modname in folder {folder}.\033[0m", file=_stderr)
+        exit(1)
+
+# 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() and not f.name.startswith('.')]
+        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() and not f.name.startswith('.')]:
+        update_folder(modfolder)
+
+
+main()

init.lua

@@ -1,11 +1,17 @@
 local mod_storage = minetest.get_mod_storage()
-local mark_priv = "interact"
-local gmark_edit = "server"
-local gmark_go = "interact"
-local tp_priv = "teleport"
+local mark_priv = {interact=true}
+local gmark_edit = {server=true}
+local gmark_go = {interact=true}
+local tp_priv = {teleport=true}
+local S = minetest.get_translator(minetest.get_current_modname())
 pos_marker = {}
--- minetest.registered_chatcommands
--- ObjectRef:set_pos(pos)
+local function tl(t)
+	local c = 0
+	for k,v in pairs(t) do
+		c = c + 1
+	end
+	return c
+end
 
 pos_marker.set = function(user, name, pos)
 	local markers = minetest.deserialize(mod_storage:get_string(tostring(user)))
@@ -16,6 +22,15 @@ pos_marker.set = function(user, name, pos)
 	mod_storage:set_string(tostring(user), minetest.serialize(markers))
 end
 
+pos_marker.del = function(user, name)
+	local markers = minetest.deserialize(mod_storage:get_string(tostring(user)))
+	if markers == nil then
+		markers = {}
+	end
+	markers[tostring(name)] = nil
+	mod_storage:set_string(tostring(user), minetest.serialize(markers))
+end
+
 pos_marker.get = function(user, name)
 	local markers = minetest.deserialize(mod_storage:get_string(tostring(user)))
 	if markers == nil then
@@ -29,129 +44,209 @@ pos_marker.get = function(user, name)
 	end
 end
 
-minetest.register_chatcommand("marker",{
-	description = "Config Markers",
-	params = "<get/set/override/tp> <marker name>",
-	func = function(name, param)
-		local player = minetest.get_player_by_name(name)
-		if not(player) then
-			return false, "Not a player!"
-		end
-		local pos = player:getpos()
-		local subcommand, markName = param:match('^(%S+)%s(.+)$')
-		if param == "" or not(subcommand) or not(markName) then
-			return false, "Invalid usage, see /help marker"
-		end
-		if subcommand == "set" then
-			if minetest.check_player_privs(name, mark_priv) then
-				local markers = minetest.deserialize(mod_storage:get_string(tostring(name)))
-				if markers and markers[markName] then
-					return false, "Can't set marker: Use `override` subcommand to override."
-				end
-				pos_marker.set(name,markName,pos)
-				return true, "Setted!"
-			else
-				return false, "No priv to do this!"
-			end
-		elseif subcommand == "override" then
-			if minetest.check_player_privs(name, mark_priv) then
-				local markers = minetest.deserialize(mod_storage:get_string(tostring(name)))
-				if not(markers and markers[markName]) then
-					return false, "Can't override marker: Use `set` subcommand to add a marker."
-				end
-				pos_marker.set(name,markName,pos)
-				return true, "Overrided!"
-			else
-				return false, "No priv to do this!"
-			end
-		elseif subcommand == "get" then
-			if minetest.check_player_privs(name, mark_priv) then
-				local mpos = pos_marker.get(name,markName)
-				if mpos then
-					return true, "The marker "..markName.." is at "..minetest.pos_to_string(mpos)
-				end
-				return false, "No this marker!"
-			else
-				return false, "No priv to do this!"
-			end
-		elseif subcommand == "tp" then
-			if minetest.check_player_privs(name, tp_priv) then
-				local mpos = pos_marker.get(name,markName)
-				if mpos then
-					player:set_pos(mpos)
-					return true, "The marker "..markName.." is at "..minetest.pos_to_string(mpos)
-				end
-				return false, "No this marker!"
-			end
-		else
-			return false, "Invalid subcommand, see /help marker"
-		end
-	end,
-})
-minetest.register_chatcommand("marks",minetest.registered_chatcommands.marker)
 
-minetest.register_chatcommand("gmarker",{
-	description = "Config Global Markers",
-	params = "<get/set/tp> <marker name>",
-	func = function(name, param)
-		local player = minetest.get_player_by_name(name)
-		if not(player) then
-			return false, "Not a player!"
-		end
-		local pos = player:getpos()
-		local subcommand, markName = param:match('^(%S+)%s(.+)$')
-		if param == "" or not(subcommand) or not(markName) then
-			return false, "Invalid usage, see /help marker"
-		end
-		if subcommand == "set" then
-			if minetest.check_player_privs(name, gmark_edit) then
-				local markers = minetest.deserialize(mod_storage:get_string(tostring("\\SERVER\\")))
-				if markers[markName] then
-					return false, "Can't set marker: Use `override` subcommand to override."
+subcommands.register_command_with_subcommand("marker",{
+	description = S("Control Markers"),
+	_sc_def = {
+		set = {
+			description = S("Set a marker"),
+			privs = mark_priv,
+			params = S("<marker name>"),
+			func = function(name,param)
+				local player = minetest.get_player_by_name(name)
+				if not(player) then
+					return false, S("Player not online!")
 				end
-				pos_marker.set("\\SERVER\\",markName,pos)
-				return true, "Setted!"
-			else
-				return false, "No priv to do this!"
-			end
-		elseif subcommand == "override" then
-			if minetest.check_player_privs(name, mark_priv) then
-				local markers = minetest.deserialize(mod_storage:get_string(tostring("\\SERVER\\")))
-				if not(markers[markName]) then
-					return false, "Can't override marker: Use `set` subcommand to add a marker."
+				local pos = player:get_pos()
+				local markers = minetest.deserialize(mod_storage:get_string(tostring(name)))
+				if markers and markers[param] then
+					return false, S("Can't set marker: Use `override` subcommand to override.")
 				end
-				pos_marker.set("\\SERVER\\",markName,pos)
-				return true, "Overrided!"
-			else
-				return false, "No priv to do this!"
+				pos_marker.set(name,param,pos)
+				return true, S("Marker set!")
 			end
-		elseif subcommand == "get" then
-			if minetest.check_player_privs(name, mark_priv) then
-				local mpos = pos_marker.get("\\SERVER\\",markName)
+		},
+		override = {
+			description = S("Override a marker"),
+			privs = mark_priv,
+			params = S("<marker name>"),
+			func = function(name,param)
+				local player = minetest.get_player_by_name(name)
+				if not(player) then
+					return false, S("Player not online!")
+				end
+				local pos = player:get_pos()
+				local markers = minetest.deserialize(mod_storage:get_string(tostring(name)))
+				if not(markers and markers[param]) then
+					return false, S("Can't override marker: Use `set` subcommand to add a marker.")
+				end
+				pos_marker.set(name,param,pos)
+				return true, S("Marker overrided!")
+			end
+		},
+		delete = {
+			description = S("Delete a marker"),
+			privs = mark_priv,
+			params = S("<marker name>"),
+			func = function(name,param)
+				local markers = minetest.deserialize(mod_storage:get_string(tostring(name)))
+				if not(markers and markers[param]) then
+					return false, S("Can't delete marker: Marker not exist!")
+				end
+				pos_marker.del(name,param)
+				return true, S("Deleted!")
+			end
+		},
+		list = {
+			description = S("List all markers"),
+			privs = mark_priv,
+			params = "",
+			func = function(name,param)
+				local RSTR = "-".."- " .. S("Marker List Start") .. " -".."-\n"
+				local markers = minetest.deserialize(mod_storage:get_string(tostring(name)))
+				if not markers then
+					return false, S("No markers!")
+				end
+				for k,v in pairs(markers) do
+					RSTR = RSTR .. k .. minetest.pos_to_string(v) .. "\n"
+				end
+				RSTR = RSTR .. "-".."- " .. S("Marker List End, Total @1 Markers",tostring(tl(markers))) .. " -".."-"
+				return true, RSTR
+			end,
+		},
+		get = {
+			description = S("Get a marker's pos"),
+			privs = mark_priv,
+			params = S("<marker name>"),
+			func = function(name,param)
+				local mpos = pos_marker.get(name,param)
 				if mpos then
-					return true, "The marker "..markName.." is at "..minetest.pos_to_string(mpos)
+					return true, S("The marker @1 is at @2",param,minetest.pos_to_string(mpos))
 				end
-				return false, "No this marker!"
-			else
-				return false, "No priv to do this!"
+				return false, S("No this marker!")
 			end
-		elseif subcommand == "tp" then
-			if minetest.check_player_privs(name, gmark_go) then
-				local mpos = pos_marker.get("\\SERVER\\",markName)
+		},
+		tp = {
+			description = S("Teleport to a marker"),
+			params = S("<marker name>"),
+			privs = tp_priv,
+			func = function(name,param)
+				local player = minetest.get_player_by_name(name)
+				if not(player) then
+					return false, S("Player not online!")
+				end
+				local mpos = pos_marker.get(name,param)
 				if mpos then
 					player:set_pos(mpos)
-					return true, "The marker "..markName.." is at "..minetest.pos_to_string(mpos)
+					return true, S("The marker @1 is at @2",param,minetest.pos_to_string(mpos))
 				end
-				return false, "No this marker!"
-			else
-				return false, "No priv to do this!"
+				return false, S("No this marker!")
 			end
-		else
-			return false, "Invalid subcommand, see /help marker"
-		end
-	end,
+		},
+	},
+})
+
+
+subcommands.register_command_with_subcommand("gmarker",{
+	description = S("Control Global Markers"),
+	_sc_def = {
+		set = {
+			description = S("Set a marker"),
+			privs = gmark_edit,
+			params = S("<marker name>"),
+			func = function(name,param)
+				local player = minetest.get_player_by_name(name)
+				if not(player) then
+					return false, S("Player not online!")
+				end
+				local pos = player:get_pos()
+				local markers = minetest.deserialize(mod_storage:get_string(tostring("\\SERVER\\")))
+				if markers and markers[param] then
+					return false, S("Can't set marker: Use `override` subcommand to override.")
+				end
+				pos_marker.set("\\SERVER\\",param,pos)
+				return true, S("Marker set!")
+			end
+		},
+		override = {
+			description = S("Override a marker"),
+			privs = gmark_edit,
+			params = S("<marker name>"),
+			func = function(name,param)
+				local player = minetest.get_player_by_name(name)
+				if not(player) then
+					return false, S("Player not online!")
+				end
+				local pos = player:get_pos()
+				local markers = minetest.deserialize(mod_storage:get_string(tostring("\\SERVER\\")))
+				if not(markers and markers[param]) then
+					return false, S("Can't override marker: Use `set` subcommand to add a marker.")
+				end
+				pos_marker.set("\\SERVER\\",param,pos)
+				return true, "Overrided!"
+			end
+		},
+		delete = {
+			description = S("Delete a marker"),
+			privs = gmark_edit,
+			params = "<marker name>",
+			func = function(name,param)
+				local markers = minetest.deserialize(mod_storage:get_string(tostring("\\SERVER\\")))
+				if not(markers and markers[param]) then
+					return false, S("Can't override marker: Marker not exist!")
+				end
+				pos_marker.del("\\SERVER\\",param)
+				return true, S("Deleted!")
+			end
+		},
+		list = {
+			description = S("List all markers"),
+			privs = mark_priv,
+			params = "",
+			func = function(name,param)
+				local RSTR = "-".."- " .. S("Global Marker List Start") .. " -".."-\n"
+				local markers = minetest.deserialize(mod_storage:get_string(tostring("\\SERVER\\")))
+				if not markers then
+					return false, S("No markers!")
+				end
+				for k,v in pairs(markers) do
+					RSTR = RSTR .. k .. minetest.pos_to_string(v) .. "\n"
+				end
+				RSTR = RSTR .. "-".."- " .. S("Global Marker List End, Total @1 Markers",tostring(tl(markers))) .. " -".."-"
+				return true, RSTR
+			end,
+		},
+		get = {
+			description = S("Get a marker's pos"),
+			privs = mark_priv,
+			params = S("<marker name>"),
+			func = function(name,param)
+				local mpos = pos_marker.get("\\SERVER\\",param)
+				if mpos then
+					return true, S("The marker @1 is at @2",param,minetest.pos_to_string(mpos))
+				end
+				return false, S("No this marker!")
+			end
+		},
+		tp = {
+			description = S("Teleport to a marker"),
+			params = S("<marker name>"),
+			privs = gmark_go,
+			func = function(name,param)
+				local player = minetest.get_player_by_name(name)
+				if not(player) then
+					return false, S("Player not online!")
+				end
+				local mpos = pos_marker.get("\\SERVER\\",param)
+				if mpos then
+					player:set_pos(mpos)
+					return true, S("The marker @1 is at @2",param,minetest.pos_to_string(mpos))
+				end
+				return false, S("No this marker!")
+			end
+		},
+	},
 })
 
 minetest.register_chatcommand("gmarks",minetest.registered_chatcommands.gmarker)
-
-
+minetest.register_chatcommand("marks",minetest.registered_chatcommands.marker)

locale/pos_marker.zh_TW.tr

@@ -0,0 +1,25 @@
+# textdomain: pos_marker
+Control Markers=管理標記
+Set a marker=加入標記
+<marker name>=<標記名稱>
+Player not online!=玩家不在線！
+Can't set marker: Use `override` subcommand to override.=無法設定標記：使用`override`子指令以覆蓋現有標記。
+Marker set!=已設定標記！
+Override a marker=覆蓋現有標記
+Can't override marker: Use `set` subcommand to add a marker.=無法覆蓋標記：使用`override`子指令以設定新標記。
+Marker overrided!=已覆蓋標記！
+Delete a marker=移除標記
+Can't delete marker: Marker not exist!=無法移除標記：標記不存在！
+Deleted!=已移除！
+List all markers=列出所有標記
+Marker List Start=標記列表開始
+No markers!=沒有標記！
+Marker List End, Total @1 Markers=標記列表結束，共@1個標記
+Get a marker's pos=獲得標記的坐標
+The marker @1 is at @2=標記@1在@2
+No this marker!=標記不存在！
+Teleport to a marker=傳送至標記
+Control Global Markers=管理全域標記
+Can't override marker: Marker not exist!=無法覆蓋標記：標記不存在！
+Global Marker List Start=全域標記列表開始
+Global Marker List End, Total @1 Markers=全域標記列表結束，共@1個全域標記

locale/template.txt

@@ -0,0 +1,25 @@
+# textdomain: pos_marker
+Control Markers=
+Set a marker=
+<marker name>=
+Player not online!=
+Can't set marker: Use `override` subcommand to override.=
+Marker set!=
+Override a marker=
+Can't override marker: Use `set` subcommand to add a marker.=
+Marker overrided!=
+Delete a marker=
+Can't delete marker: Marker not exist!=
+Deleted!=
+List all markers=
+Marker List Start=
+No markers!=
+Marker List End, Total @1 Markers=
+Get a marker's pos=
+The marker @1 is at @2=
+No this marker!=
+Teleport to a marker=
+Control Global Markers=
+Can't override marker: Marker not exist!=
+Global Marker List Start=
+Global Marker List End, Total @1 Markers=

mod.conf

@@ -1,3 +1,4 @@
 name = pos_marker
 description = Add markers that can set and get via chatcommand.
+depends = subcommands
 optional_depends = security