Module:Lang - Revision history

Skritzer: 1 revision imported

2021-12-06T18:23:05Z

1 revision imported

wikipedia>Trappist the monk at 12:32, 7 June 2021

2021-06-07T12:32:59Z

Skritzer: 1 revision imported

2020-12-15T20:38:38Z

1 revision imported

wikipedia>Gonnym: Undid revision 987830693 by Gonnym (talk) bug found, temp revert

2020-11-09T14:39:01Z

Undid revision 987830693 by Gonnym (talk) bug found, temp revert

Show changes

Skritzer: 1 revision imported

2020-03-14T15:42:36Z

1 revision imported

wikipedia>Trappist the monk: remove deprecated entry points;

2020-02-09T23:50:04Z

remove deprecated entry points;

Skritzer: 1 revision imported

2020-01-23T00:39:58Z

1 revision imported

wikipedia>Trappist the monk: synch from sandbox; proto-language handling; external template error messaging tweaks;

2019-12-29T18:09:05Z

synch from sandbox; proto-language handling; external template error messaging tweaks;

Skritzer: 1 revision imported

2019-12-19T19:08:14Z

1 revision imported

wikipedia>Trappist the monk: sync from sandbox;

2019-10-20T11:20:25Z

sync from sandbox;

Show changes

@@ Line 385: / Line 385: @@
 				end
 			end
-		else
+		else																	-- cheap way to determine if there are prefixes; fonipa and others don't have prefixes; # operator always returns 0
-			if not in_array (code, variant_table[variant]['prefixes']) then
+			if variant_table[variant]['prefixes'][1] and not in_array (code, variant_table[variant]['prefixes']) then
 				return code, script, region, nil, nil, table.concat ({'unrecognized variant: ', variant, ' for code: ', code});
 			end
 		end
 	end
-−
 	if is_set (private) then
 		private = private:lower();												-- ensure that we use and return lower case version of this
@@ Line 510: / Line 510: @@
 	table.insert (html, table.concat ({'<', tag}));								-- open the <i>, <span>, or <div> html tag
 	table.insert (html, table.concat ({' lang="', code, '\"'}));				-- add language attribute
@@ Line 535: / Line 536: @@
 			table.insert (html, ' collective text');							-- for collective languages
 		else
-			table.insert (html, ' language text');								-- for individual languages
+			table.insert (html, '-language text');								-- for individual languages
 		end
 		table.insert (html, '\">');												-- close the opening html tag
@@ Line 1,157: / Line 1,158: @@
 	args.text = proto_prefix (args.text, language_name, args.proto);			-- prefix proto-language text with a splat
-	table.insert (out, make_text_html (args.code, args.text, tag, args.rtl, args.italic, args.size, nil))
+	table.insert (out, make_text_html (args.code, args.text, tag, args.rtl, args.italic, args.size, ('none' == args.label) and language_name or nil))
 	if is_set (args.translit) and not unicode.is_Latin (args.text) then			-- transliteration (not supported in {{lang}}); not supported when args.text is wholly latn text (this is an imperfect test)
@@ Line 1,194: / Line 1,195: @@
 				table.insert (out, make_wikilink ('Literal translation', 'lit.'));
 			end
-			table.insert (out, "&nbsp;</small>");
+			table.insert (out, "&thinsp;</small>");
 		end
 		table.insert (out, table.concat ({'&#39;', args.translation, '&#39;'}));	-- use html entities to avoid wiki markup confusion
@@ Line 1,312: / Line 1,313: @@
 local function is_ietf_tag (frame)
-	return _is_ietf_tag (getArgs(frame)[1]);									-- args[1] is the ietf language tag to be tested; getArgs() so we also get parent frame
+	return _is_ietf_tag (getArgs (frame)[1]);									-- args[1] is the ietf language tag to be tested; also get parent frame
 end
@@ Line 1,441: / Line 1,455: @@
 	local title_table = lang_data.translit_title_table;							-- table of transliteration standards and the language codes and scripts that apply to those standards
 	local language_name;														-- language name that matches language code; used for tool tip
-	local translit;																-- translitterated text to display
+	local translit;																-- transliterated text to display
 	local script;																-- IANA script
 	local msg;																	-- for when called functions return an error message
@@ Line 1,566: / Line 1,580: @@
 	lang_xx_italic = lang_xx_italic,
 	is_ietf_tag = is_ietf_tag,
 	is_lang_name = is_lang_name,
 	tag_from_name = tag_from_name,												-- returns ietf tag associated with language name

@@ Line 1,508: / Line 1,508: @@
 	_name_from_tag = _name_from_tag,
 	_transl = _transl,
 	};

@@ Line 480: / Line 480: @@
 	if text:match ('^%*') then
-		table.insert (html, '&#42;');											-- move proto language text prefix outside of italic markup if any; use numeric entity because plane splat confuses MediaWiki
+		table.insert (html, '&#42;');											-- move proto language text prefix outside of italic markup if any; use numeric entity because plain splat confuses MediaWiki
 		text = text:gsub ('^%*', '');											-- remove the splat from the text
 	end
@@ Line 732: / Line 732: @@
 will be rendered outside of italic markup (if used).  If the first character in text here is already a splat, we
 do nothing
 ]]
-local function proto_prefix (text, language_name)
+local function proto_prefix (text, language_name, proto_param)
-	if language_name:find ('^Proto%-') and not text:find ('^*') then			-- language is a proto and text does not already have leading splat
+	if false == proto_param then												-- when forced by |proto=no
-		return table.concat ({'*', text});										-- prefix proto language text with a splat
+		return text:gsub ('^%**', '');											-- return text without splat prefix regardless of language name or existing splat prefix in text
 	end
-	return text;
+	return text:gsub ('^%*+', '*');												-- return text unmolested except multiple splats reduced to one splat
 end
@@ Line 793: / Line 798: @@
 	return text, tag;
 end
@@ Line 828: / Line 854: @@
 	end
-	msg = validate_text ('lang', args);											-- ensure that |text= is set
+	msg = validate_text (template, args);											-- ensure that |text= is set
 	if is_set (msg) then														-- msg is an already-formatted error message
 		return msg;
@@ Line 838: / Line 864: @@
 	args.rtl = args.rtl == 'yes';												-- convert to boolean: 'yes' -> true, other values -> false
 	code, subtags.script, subtags.region, subtags.variant, subtags.private, msg = get_ietf_parts (args.code);	-- |script=, |region=, |variant= not supported because they should be part of args.code ({{{1}}} in {{lang}})
@@ Line 882: / Line 913: @@
 		args.text = invert_italics (args.text)
 	end
-−
-	args.text = proto_prefix (args.text, language_name);						-- prefix proto-language text with a splat
+	args.text = proto_prefix (args.text, language_name, args.proto);			-- prefix proto-language text with a splat
 	table.insert (out, make_text_html (args.code, args.text, tag, args.rtl, args.italic, args.size, language_name));
@@ Line 979: / Line 1,010: @@
 	local msg;																	-- for error messages
 	local tag = 'span';															-- initial value for make_text_html()
 	if args[1] and args.text then
-		return make_error_msg ('conflicting: {{{1}}} and &#124;text=', args, 'lang-xx');
+		return make_error_msg ('conflicting: {{{1}}} and &#124;text=', args, template);
 	else
 		args.text = args[1] or args.text;										-- prefer args.text
 	end
-	msg = validate_text ('lang-xx', args);										-- ensure that |text= is set, does not contain italic markup and is protected from improper bolding
+	msg = validate_text (template, args);										-- ensure that |text= is set, does not contain italic markup and is protected from improper bolding
 	if is_set (msg) then
 		return msg;
@@ Line 994: / Line 1,026: @@
 	if args[2] and args.translit then
-		return make_error_msg ('conflicting: {{{2}}} and &#124;translit=', args, 'lang-xx');
+		return make_error_msg ('conflicting: {{{2}}} and &#124;translit=', args, template);
 	else
 		args.translit = args[2] or args.translit								-- prefer args.translit
@@ Line 1,000: / Line 1,032: @@
 	if args[3] and (args.translation or args.lit) then
-		return make_error_msg ('conflicting: {{{3}}} and &#124;lit= or &#124;translation=', args, 'lang-xx');
+		return make_error_msg ('conflicting: {{{3}}} and &#124;lit= or &#124;translation=', args, template);
 	elseif args.translation and args.lit then
-		return make_error_msg ('conflicting: &#124;lit= and &#124;translation=', args, 'lang-xx');
+		return make_error_msg ('conflicting: &#124;lit= and &#124;translation=', args, template);
 	else
 		args.translation = args[3] or args.translation or args.lit;				-- prefer args.translation
@@ Line 1,008: / Line 1,040: @@
 	if args.links and args.link then
-		return make_error_msg ('conflicting: &#124;links= and &#124;link=', args, 'lang-xx');
+		return make_error_msg ('conflicting: &#124;links= and &#124;link=', args, template);
 	else
 		args.link = args.link or args.links;									-- prefer args.link
@@ Line 1,020: / Line 1,052: @@
 	if msg then																	-- if an error detected then there is an error message
-		return make_error_msg (msg, args, 'lang-xx');
+		return make_error_msg (msg, args, template);
 	end
 	args.italic, msg = validate_italic (args);
 	if msg then
-		return make_error_msg (msg, args, 'lang-xx');
+		return make_error_msg (msg, args, template);
 	end
@@ Line 1,046: / Line 1,078: @@
 			args.rtl = false;													-- script is not an rtl script
 		end
 	end
@@ Line 1,094: / Line 1,131: @@
 	end
-	args.text = proto_prefix (args.text, language_name);						-- prefix proto-language text with a splat
+	args.text = proto_prefix (args.text, language_name, args.proto);			-- prefix proto-language text with a splat
 	table.insert (out, make_text_html (args.code, args.text, tag, args.rtl, args.italic, args.size))
@@ Line 1,120: / Line 1,157: @@
 			table.insert (out, translit);
 		else
-			return make_error_msg (table.concat ({'invalid translit-std: \'', args['translit-std'] or '[missing]'}), args, 'lang-xx');
+			return make_error_msg (table.concat ({'invalid translit-std: \'', args['translit-std'] or '[missing]'}), args, template);
 		end
 	end