From 3c16d40cd2e9d4899998d56ccbf5c3700c25089c Mon Sep 17 00:00:00 2001 From: Kevin Lyles Date: Sun, 6 Mar 2011 14:49:37 -0600 Subject: [PATCH] Removed DECIMAL_SEPARATOR and let the already-localized strings handle it --- Locales/enUS/base.lua | 7 +++---- Upgrade.lua | 2 +- config.lua | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Locales/enUS/base.lua b/Locales/enUS/base.lua index 507b7cc..5670485 100644 --- a/Locales/enUS/base.lua +++ b/Locales/enUS/base.lua @@ -6,8 +6,8 @@ local L = ww_localization -- config.lua L["WW_VERSION"] = "WeightsWatcher version: %s" -L["ACCT_VERSION"] = " Account data version: %d%s%d" -L["CHAR_VERSION"] = " Character data version: %d%s%d" +L["ACCT_VERSION"] = " Account data version: %d.%d" +L["CHAR_VERSION"] = " Character data version: %d.%d" L["HELP_TEXT_HEADER"] = "WeightsWatcher help:" L["HELP_TEXT_GENERAL"] = "Type /weightswatcher (or /ww )" L["HELP_TEXT_CONFIG"] = " config opens the main configuration window" @@ -18,7 +18,6 @@ L["HELP_TEXT_BUGS"] = " Please report bugs at wowinterface.com or WeightsWatche L["config"] = "config" L["version"] = "version" L["weights"] = "weights" -L["DECIMAL_SEPARATOR"] = "." -- config.xml L["CONFIG_TITLE"] = "WeightsWatcher Configuration" @@ -137,7 +136,7 @@ L["UPGRADE_ERR_NO_FUNC_TBL"] = "WeightsWatcher: error: no %s function table foun L["LOADING_DEFAULTS"] = "WeightsWatcher: no %s data found, loading defaults." L["account"] = "account" L["character"] = "character" -L["UPGRADE_ATTEMPT"] = "WeightsWatcher: attempting to %s %s data from version %d%s%d to %d%4$s%7$d." +L["UPGRADE_ATTEMPT"] = "WeightsWatcher: attempting to %s %s data from version %d.%d to %d.%d." L["UPGRADE_ERR_NO_PATH"] = "WeightsWatcher: error: No %s data %s path found." L["UPGRADE_ERR_GENERIC"] = "WeightsWatcher: %s data %s error." L["UPGRADE_ERR_INF_LOOP"] = "WeightsWatcher: error: infinite loop in %s data %s." diff --git a/Upgrade.lua b/Upgrade.lua index d7a2e08..cbf3529 100644 --- a/Upgrade.lua +++ b/Upgrade.lua @@ -1173,7 +1173,7 @@ function WeightsWatcher.Upgrade(dataType) if oldMajorVersion == 0 and oldMinorVersion == 0 then print(string.format(L["LOADING_DEFAULTS"], dataType)) else - print(string.format(L["UPGRADE_ATTEMPT"], direction, dataType, oldMajorVersion, L["DECIMAL_SEPARATOR"], oldMinorVersion, newMajorVersion, newMinorVersion)) + print(string.format(L["UPGRADE_ATTEMPT"], direction, dataType, oldMajorVersion, oldMinorVersion, newMajorVersion, newMinorVersion)) end local newVars = ww_deepTableCopy(vars) diff --git a/config.lua b/config.lua index ffe6f3f..58c3d29 100644 --- a/config.lua +++ b/config.lua @@ -34,8 +34,8 @@ function ww_commandHandler(msg) end elseif msg == L["version"] then print(string.format(L["WW_VERSION"], GetAddOnMetadata("WeightsWatcher", "Version"))) - print(string.format(L["ACCT_VERSION"], ww_vars.dataMajorVersion, L["DECIMAL_SEPARATOR"], ww_vars.dataMinorVersion)) - print(string.format(L["CHAR_VERSION"], ww_charVars.dataMajorVersion, L["DECIMAL_SEPARATOR"], ww_charVars.dataMinorVersion)) + print(string.format(L["ACCT_VERSION"], ww_vars.dataMajorVersion, ww_vars.dataMinorVersion)) + print(string.format(L["CHAR_VERSION"], ww_charVars.dataMajorVersion, ww_charVars.dataMinorVersion)) else printHelp() end -- 1.7.9.5