Module:Currency - Revision history

WOSlinker: use require('strict') instead of require('Module:No globals')

2022-10-21T22:00:00Z

use require('strict') instead of require('Module:No globals')

← Previous revision		Revision as of 22:00, 21 October 2022
Line 1:		Line 1:
	require('~~Module:No globals~~')		require('strict')

	local p = {}		local p = {}

MusikBot II: Changed protection settings for "Module:Currency": High-risk template or module: 2505 transclusions (more info) ([Edit=Require extended confirmed access] (indefinite) [Move=Require extended confirmed access] (indefinite))

2022-01-15T17:59:57Z

Changed protection settings for "Module:Currency": High-risk template or module: 2505 transclusions (more info) ([Edit=Require extended confirmed access] (indefinite) [Move=Require extended confirmed access] (indefinite))

← Previous revision	Revision as of 17:59, 15 January 2022
(No difference)

ProcrastinatingReader: spacing

2020-07-21T18:34:33Z

spacing

← Previous revision		Revision as of 18:34, 21 July 2020
Line 110:		Line 110:

	if not passthrough then		if not passthrough then
	amount = tonumber (amount); -- make sure it's a number		amount = tonumber (amount); -- make sure it's a number
	end		end

Line 243:		Line 243:


	local n, q = amount:match ('([%-−]?[%d%.,]+)%s*(%a+)$'); -- see if there is a quantifier following a number; zero or more space characters		local n, q = amount:match ('([%-−]?[%d%.,]+)%s*(%a+)$'); -- see if there is a quantifier following a number; zero or more space characters
	if nil == n then		if nil == n then
	n, q = amount:match ('([%-−]?[%d%.,]+) (%a+)$') -- see if there is a quantifier following a number; nbsp html entity ({{format price}} output		n, q = amount:match ('([%-−]?[%d%.,]+) (%a+)$') -- see if there is a quantifier following a number; nbsp html entity ({{format price}} output
	end		end
	if nil == n then return amount end; -- if not <number><space><quantifier> return amount unmolested		if nil == n then return amount end; -- if not <number><space><quantifier> return amount unmolested

Psiĥedelisto: just treat 'd' as 's' if passthrough is true

2020-05-18T06:42:29Z

just treat 'd' as 's' if passthrough is true

← Previous revision		Revision as of 06:42, 18 May 2020
Line 49:		Line 49:
	return string.format ('%s %s', amount, symbol);		return string.format ('%s %s', amount, symbol);
	elseif 'd' == position then -- special case that replaces the decimal separator with symbol (Cifrão for CVE is the only extant case)		elseif 'd' == position then -- special case that replaces the decimal separator with symbol (Cifrão for CVE is the only extant case)
			if passthrough then
			return string.format('%s%s', symbol, amount)
			end

	local digits, decimals; -- this code may not work for other currencies or on other language wikis		local digits, decimals; -- this code may not work for other currencies or on other language wikis
	if amount:match ('[%d,]+%.%d+') then -- with decimal separator and decimals		if amount:match ('[%d,]+%.%d+') then -- with decimal separator and decimals

Psiĥedelisto: +passthrough (this one works :) )

2020-05-18T06:36:00Z

+passthrough (this one works :) )

← Previous revision		Revision as of 06:36, 18 May 2020
Line 24:		Line 24:
	]]		]]

	local function make_short_form_name (amount, code, linked)		local function make_short_form_name (amount, code, linked, passthrough)
	local symbol;		local symbol;
	local position = properties[code].position;		local position = properties[code].position;
Line 34:		Line 34:
	end		end

		⚫	if not passthrough then
	amount = lang:formatNum (tonumber(amount)); -- add appropriate comma separators		amount = lang:formatNum (tonumber(amount)); -- add appropriate comma separators
			end
		⚫
	amount = amount:gsub ('^%-', '−'); -- replace the hyphen with unicode minus		amount = amount:gsub ('^%-', '−'); -- replace the hyphen with unicode minus

Line 95:		Line 98:
	]]		]]

	local function make_long_form_name (amount, code, linked)		local function make_long_form_name (amount, code, linked, passthrough)
	local name;		local name, formatted;

	if not is_set (properties[code].page) then		if not is_set (properties[code].page) then
Line 102:		Line 105:
	end		end

			if not passthrough then
	amount = tonumber (amount); -- make sure it's a number		amount = tonumber (amount); -- make sure it's a number
⚫
			end

	if 1 == amount then		if 1 == amount then
	name = make_name (linked, properties[code].page); -- the singular form		name = make_name (linked, properties[code].page); -- the singular form
Line 110:		Line 115:
	else		else
	name = make_name (linked, properties[code].page); -- plural but no separate plural form so use the singular form		name = make_name (linked, properties[code].page); -- plural but no separate plural form so use the singular form
			end

			if not passthrough then
			formatted = lang:formatNum (amount)
			else
			formatted = amount
	end		end

	return string.format ('%s %s', ~~lang:formatNum (amount)~~, name); -- put it all together		return string.format ('%s %s', formatted, name); -- put it all together
	end		end

Line 125:		Line 136:
	]]		]]

	local function render_currency (amount, code, long_form, linked, fmt)		local function render_currency (amount, code, long_form, linked, fmt, passthrough)
	local name;		local name;
	local result;		local result;
Line 141:		Line 152:
	return '<span style="font-size:inherit" class="error">{{currency}} – invalid code ([[Template:Currency/doc#Error_messages\|help]])</span>';		return '<span style="font-size:inherit" class="error">{{currency}} – invalid code ([[Template:Currency/doc#Error_messages\|help]])</span>';
	end		end


	if long_form then		if long_form then
	result = make_long_form_name (amount, code, linked); --		result = make_long_form_name (amount, code, linked, passthrough); --
	else		else
	result = make_short_form_name (amount, code, linked);		result = make_short_form_name (amount, code, linked, passthrough);
	end		end

Line 257:		Line 269:
	local long_form = false;		local long_form = false;
	local linked = true;		local linked = true;
			local passthrough = false;

	if not is_set (args[1]) then		if not is_set (args[1]) then
Line 266:		Line 279:
	-- return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';		-- return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
	-- end		-- end

⚫	amount = convert_string_to_numeric (args[1]);
			-- This allows us to use {{currency}} while actually following [[MOS:CURRENCY]] as regards "billion", "million", "M", "bn", etc.
⚫	amount = parse_formatted_number(amount); -- if args[1] can't be converted to a number then error
			if not (args['passthrough'] == 'yes') then -- just pass whatever string is given through.
⚫	if not ~~amount~~ then
		⚫	amount = convert_string_to_numeric (args[1]);
⚫	return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
		⚫	amount = parse_formatted_number(amount); -- if args[1] can't be converted to a number then error
			if not amount then
		⚫	return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
			end
			else
			amount = args[1]
	end		end

Line 286:		Line 305:
	end		end

	return render_currency (amount, code, long_form, linked, args['fmt'])		return render_currency (amount, code, long_form, linked, args['fmt'], (args['passthrough'] == 'yes'))
	end		end

Psiĥedelisto: Undid revision 957314800 by Psiĥedelisto (talk) ; It was close but no cigar, I thought maybe the "formatNum" error thing only happened in "Preview page w/this module" mode so that's why I tried. Now I learned I was wrong.

2020-05-18T06:25:33Z

Undid revision 957314800 by Psiĥedelisto (talk) ; It was close but no cigar, I thought maybe the "formatNum" error thing only happened in "Preview page w/this module" mode so that's why I tried. Now I learned I was wrong.

← Previous revision		Revision as of 06:25, 18 May 2020
Line 24:		Line 24:
	]]		]]

	local function make_short_form_name (amount, code, linked~~, passthrough~~)		local function make_short_form_name (amount, code, linked)
	local symbol;		local symbol;
	local position = properties[code].position;		local position = properties[code].position;
Line 34:		Line 34:
	end		end

		⚫	amount = lang:formatNum (tonumber(amount)); -- add appropriate comma separators
⚫	if not ~~passthrough~~ then
⚫	amount = lang:formatNum (tonumber(amount)); -- add appropriate comma separators
	end

	amount = amount:gsub ('^%-', '−'); -- replace the hyphen with unicode minus		amount = amount:gsub ('^%-', '−'); -- replace the hyphen with unicode minus

Line 98:		Line 95:
	]]		]]

	local function make_long_form_name (amount, code, linked~~, passthrough~~)		local function make_long_form_name (amount, code, linked)
	local name~~, formatted~~;		local name;

	if not is_set (properties[code].page) then		if not is_set (properties[code].page) then
Line 105:		Line 102:
	end		end

		⚫	amount = tonumber (amount); -- make sure it's a number
	if not passthrough then
⚫	amount = tonumber (amount); -- make sure it's a number
	end

	if 1 == amount then		if 1 == amount then
Line 115:		Line 110:
	else		else
	name = make_name (linked, properties[code].page); -- plural but no separate plural form so use the singular form		name = make_name (linked, properties[code].page); -- plural but no separate plural form so use the singular form
	end

	if not passthrough then
	formatted = lang:formatNum (amount)
	else
	formatted = amount
	end		end

	return string.format ('%s %s', ~~formatted~~, name); -- put it all together		return string.format ('%s %s', lang:formatNum (amount), name); -- put it all together
	end		end

Line 136:		Line 125:
	]]		]]

	local function render_currency (amount, code, long_form, linked, fmt~~, passthrough~~)		local function render_currency (amount, code, long_form, linked, fmt)
	local name;		local name;
	local result;		local result;
Line 152:		Line 141:
	return '<span style="font-size:inherit" class="error">{{currency}} – invalid code ([[Template:Currency/doc#Error_messages\|help]])</span>';		return '<span style="font-size:inherit" class="error">{{currency}} – invalid code ([[Template:Currency/doc#Error_messages\|help]])</span>';
	end		end


	if long_form then		if long_form then
	result = make_long_form_name (amount, code, linked~~, passthrough~~); --		result = make_long_form_name (amount, code, linked); --
	else		else
	result = make_short_form_name (amount, code, linked~~, passthrough~~);		result = make_short_form_name (amount, code, linked);
	end		end

Line 269:		Line 257:
	local long_form = false;		local long_form = false;
	local linked = true;		local linked = true;
	local passthrough = false;

	if not is_set (args[1]) then		if not is_set (args[1]) then
Line 279:		Line 266:
	-- return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';		-- return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
	-- end		-- end
		⚫	amount = convert_string_to_numeric (args[1]);

		⚫	amount = parse_formatted_number(amount); -- if args[1] can't be converted to a number then error
	-- This allows us to use {{currency}} while actually following [[MOS:CURRENCY]] as regards "billion", "million", "M", "bn", etc.
		⚫	if not amount then
	if not args['passthrough'] == 'yes' then -- just pass whatever string is given through.
		⚫	return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
⚫	amount = convert_string_to_numeric (args[1]);
⚫	amount = parse_formatted_number(amount); -- if args[1] can't be converted to a number then error
	if not amount then
⚫	return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
	end
	else
	amount = args[1]
	end		end

Line 305:		Line 286:
	end		end

	return render_currency (amount, code, long_form, linked, args['fmt']~~, args['passthrough'] == 'yes'~~)		return render_currency (amount, code, long_form, linked, args['fmt'])
	end		end

Psiĥedelisto: +passthrough

2020-05-18T06:24:05Z

+passthrough

← Previous revision		Revision as of 06:24, 18 May 2020
Line 24:		Line 24:
	]]		]]

	local function make_short_form_name (amount, code, linked)		local function make_short_form_name (amount, code, linked, passthrough)
	local symbol;		local symbol;
	local position = properties[code].position;		local position = properties[code].position;
Line 34:		Line 34:
	end		end

		⚫	if not passthrough then
	amount = lang:formatNum (tonumber(amount)); -- add appropriate comma separators		amount = lang:formatNum (tonumber(amount)); -- add appropriate comma separators
			end

	amount = amount:gsub ('^%-', '−'); -- replace the hyphen with unicode minus		amount = amount:gsub ('^%-', '−'); -- replace the hyphen with unicode minus

Line 95:		Line 98:
	]]		]]

	local function make_long_form_name (amount, code, linked)		local function make_long_form_name (amount, code, linked, passthrough)
	local name;		local name, formatted;

	if not is_set (properties[code].page) then		if not is_set (properties[code].page) then
Line 102:		Line 105:
	end		end

			if not passthrough then
	amount = tonumber (amount); -- make sure it's a number		amount = tonumber (amount); -- make sure it's a number
			end

	if 1 == amount then		if 1 == amount then
Line 110:		Line 115:
	else		else
	name = make_name (linked, properties[code].page); -- plural but no separate plural form so use the singular form		name = make_name (linked, properties[code].page); -- plural but no separate plural form so use the singular form
			end

			if not passthrough then
			formatted = lang:formatNum (amount)
			else
			formatted = amount
	end		end

	return string.format ('%s %s', ~~lang:formatNum (amount)~~, name); -- put it all together		return string.format ('%s %s', formatted, name); -- put it all together
	end		end

Line 125:		Line 136:
	]]		]]

	local function render_currency (amount, code, long_form, linked, fmt)		local function render_currency (amount, code, long_form, linked, fmt, passthrough)
	local name;		local name;
	local result;		local result;
Line 141:		Line 152:
	return '<span style="font-size:inherit" class="error">{{currency}} – invalid code ([[Template:Currency/doc#Error_messages\|help]])</span>';		return '<span style="font-size:inherit" class="error">{{currency}} – invalid code ([[Template:Currency/doc#Error_messages\|help]])</span>';
	end		end


	if long_form then		if long_form then
	result = make_long_form_name (amount, code, linked); --		result = make_long_form_name (amount, code, linked, passthrough); --
	else		else
	result = make_short_form_name (amount, code, linked);		result = make_short_form_name (amount, code, linked, passthrough);
	end		end

Line 257:		Line 269:
	local long_form = false;		local long_form = false;
	local linked = true;		local linked = true;
			local passthrough = false;

	if not is_set (args[1]) then		if not is_set (args[1]) then
Line 266:		Line 279:
	-- return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';		-- return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
	-- end		-- end

⚫	amount = convert_string_to_numeric (args[1]);
			-- This allows us to use {{currency}} while actually following [[MOS:CURRENCY]] as regards "billion", "million", "M", "bn", etc.
⚫	amount = parse_formatted_number(amount); -- if args[1] can't be converted to a number then error
			if not args['passthrough'] == 'yes' then -- just pass whatever string is given through.
⚫	if not ~~amount~~ then
		⚫	amount = convert_string_to_numeric (args[1]);
⚫	return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
		⚫	amount = parse_formatted_number(amount); -- if args[1] can't be converted to a number then error
			if not amount then
		⚫	return '<span style="font-size:inherit" class="error">{{currency}} – invalid amount ([[Template:Currency/doc#Error_messages\|help]])</span>';
			end
			else
			amount = args[1]
	end		end

Line 286:		Line 305:
	end		end

	return render_currency (amount, code, long_form, linked, args['fmt'])		return render_currency (amount, code, long_form, linked, args['fmt'], args['passthrough'] == 'yes')
	end		end

Trappist the monk: synch from sandbox;

2018-08-06T11:53:27Z

synch from sandbox;

← Previous revision		Revision as of 11:53, 6 August 2018
Line 125:		Line 125:
	]]		]]

	local function render_currency (amount, code, long_form, linked)		local function render_currency (amount, code, long_form, linked, fmt)
	local name;		local name;
			local result;

	presentation = mw.loadData ('Module:Currency/Presentation'); -- get presentation data		presentation = mw.loadData ('Module:Currency/Presentation'); -- get presentation data
Line 142:		Line 143:

	if long_form then		if long_form then
	~~return~~ make_long_form_name (amount, code, linked); --		result = make_long_form_name (amount, code, linked); --
	else		else
	~~return~~ make_short_form_name (amount, code, linked);		result = make_short_form_name (amount, code, linked);
	end		end

			if 'none' == fmt then -- no group separation
			result = result:gsub ('(%d%d?%d?),', '%1'); -- strip comma separators
			elseif 'gaps' == fmt then -- use narrow gaps
			result = result:gsub ('(%d%d?%d?),', '<span style="margin-right:.25em;">%1</span>'); -- replace comma seperators
			elseif fmt and 'commas' ~= fmt then -- if not commas (the default) then error message
			return '<span style="font-size:inherit" class="error">{{currency}} – invalid format ([[Template:Currency/doc#Error_messages\|help]])</span>';
			end

			return result; -- done
	end		end

Line 275:		Line 286:
	end		end

	return render_currency (amount, code, long_form, linked)		return render_currency (amount, code, long_form, linked, args['fmt'])
	end		end

MusikAnimal: Protected "Module:Currency": High-risk Lua module; 1,000+ transclusions ([Edit=Require autoconfirmed or confirmed access] (indefinite))

2017-10-10T17:47:25Z

Protected "Module:Currency": High-risk Lua module; 1,000+ transclusions ([Edit=Require autoconfirmed or confirmed access] (indefinite))

← Previous revision	Revision as of 17:47, 10 October 2017
(No difference)

Trappist the monk: Synch from sandbox;

2016-04-23T14:59:11Z

Synch from sandbox;

← Previous revision		Revision as of 14:59, 23 April 2016
Line 34:		Line 34:
	end		end

	amount = lang:formatNum (tonumber(amount));		amount = lang:formatNum (tonumber(amount)); -- add appropriate comma separators
			amount = amount:gsub ('^%-', '−'); -- replace the hyphen with unicode minus

	if 'b' == position then -- choose appropriate format: unspaced before the amount		if 'b' == position then -- choose appropriate format: unspaced before the amount
Line 126:		Line 127:
	local function render_currency (amount, code, long_form, linked)		local function render_currency (amount, code, long_form, linked)
	local name;		local name;
⚫	local ~~ouput~~;

	presentation = mw.loadData ('Module:Currency/Presentation'); -- get presentation data		presentation = mw.loadData ('Module:Currency/Presentation'); -- get presentation data
Line 146:		Line 146:
	return make_short_form_name (amount, code, linked);		return make_short_form_name (amount, code, linked);
	end		end

	return amount;
	end		end

Line 165:		Line 163:
	local digits = {};		local digits = {};
	local decimals;		local decimals;
		⚫	local sign = '';
	local _;		local _;

	if amount:find ('[^%d%.,]') then -- anything but digits, decimal points or commas		if amount:find ('[^%-−%d%.,]') then -- anything but sign, digits, decimal points, or commas
	return nil;		return nil;
	end		end

			amount = amount:gsub ('−', '-'); -- replace unicode minus with hyphen

	_, count = amount:gsub('%.', '') -- count the number of decimal point characters		_, count = amount:gsub('%.', '') -- count the number of decimal point characters
Line 181:		Line 182:
	end;		end;

			if amount:match ('[%-][%d%.,]+') then -- if the amount is negative
			sign, amount = amount:match ('([%-])([%d%.,]+)'); -- strip off and save the sign
			end

	parts = mw.text.split (amount, '.', true); -- split amount into digits and decimals		parts = mw.text.split (amount, '.', true); -- split amount into digits and decimals
	decimals = table.remove (parts, 2) or ''; -- if there was a decimal portion, remove from the table and save it		decimals = table.remove (parts, 2) or ''; -- if there was a decimal portion, remove from the table and save it
Line 196:		Line 201:
	end		end
	end		end

	return table.concat (digits) .. '.' .. decimals; -- reassemble without commas and return		return sign .. table.concat (digits) .. '.' .. decimals; -- reassemble without commas and return

	end		end

Line 208:		Line 213:

	local function convert_string_to_numeric (amount)		local function convert_string_to_numeric (amount)
	local quantifiers = {['thousand'] = 1000, ['million'] = 1000000, ['billion'] = 1000000000, ['trillion'] = 1000000000000};		local quantifiers = {['thousand'] = 1000, ['million'] = 1000000, ['m'] = 1000000, ['billion'] = 1000000000, ['b'] = 1000000000, ['trillion'] = 1000000000000};


	local n, q = amount:match ('([%d%.,]+)%s*(%a+)'); -- see if there is a quantifier following a number; zero or more space characters		local n, q = amount:match ('([%-−]?[%d%.,]+)%s*(%a+)$'); -- see if there is a quantifier following a number; zero or more space characters
	if nil == n then		if nil == n then
	n, q = amount:match ('([%d%.,]+) (%a+)') -- see if there is a quantifier following a number; nbsp html entity ({{format price}} output		n, q = amount:match ('([%-−]?[%d%.,]+) (%a+)$') -- see if there is a quantifier following a number; nbsp html entity ({{format price}} output
	end		end
	if nil == n then return amount end; -- if not <number><space><quantifier> return amount unmolested		if nil == n then return amount end; -- if not <number><space><quantifier> return amount unmolested