# HG changeset patch # User syzler # Date 1304202376 0 # Node ID 1d9a8aa6d72e17c329e59557d8f8d9aad97e0415 # Parent 37f948cacc7d7d2d2335388812b41c62114dd1d4# Parent f7bb718955b6cc71a81a5810e29cbbf144332355 Merging localization work from branch. diff -r 37f948cacc7d -r 1d9a8aa6d72e MyLilPony.lua --- a/MyLilPony.lua Sat Apr 30 21:54:01 2011 +0000 +++ b/MyLilPony.lua Sat Apr 30 22:26:16 2011 +0000 @@ -43,7 +43,7 @@ SLASH_MyLilPony2 = "/mlp"; SLASH_MyLilPony3 = "/mylilpony"; - MyLilPony.Log(format("Version %s loaded", MYLILPONY_VERSION)); + MyLilPony.Log(format(L["msgVersionLoaded"], MYLILPONY_VERSION)); MyLilPony.LoadDefaults(); end @@ -53,22 +53,22 @@ function MyLilPony.AutoMount() if UnitIsDead("player") or UnitIsGhost("player") then - MyLilPony.Log("You are dead"); + MyLilPony.Log(L["msgYouAreDead"]); return; end if InCombatLockdown() then - MyLilPony.Log("You are in combat"); + MyLilPony.Log(L["msgYouAreInCombat"]); return; end if IsMounted() and not MyLilPony.AutoDismount then - MyLilPony.Log("You are already mounted"); + MyLilPony.Log(L["msgYouAreMounted"]); return; end if IsMounted() and IsFlying() then - MyLilPony.Log("You are already flying"); + MyLilPony.Log(L["msgYouAreFlying"]); return; end @@ -154,14 +154,14 @@ if unit == "" or unit == nil then unit = "target" end local result = MyLilPony.CallMountByMatch(unit); if not result then - MyLilPony.Log("No matching mounts were found"); + MyLilPony.Log(L["msgNoMatchingMountsFound"]); end elseif MyLilPony.StringMatchIgnoreCase(arg, "^exact .+$") or MyLilPony.StringMatchIgnoreCase(arg, "^x .+$") then local param = MyLilPony.StringMatchIgnoreCase(arg, "^.+ (.+)$"); local result = MyLilPony.CallMountByName(param); if not result then - MyLilPony.Log(format("No matching mounts were found with NAME='%s'", param)); + MyLilPony.Log(format(L["msgNoMatchingMountsForName"], param)); end elseif MyLilPony.StringMatchIgnoreCase(arg, "^list .+$") or MyLilPony.StringMatchIgnoreCase(arg, "^find .+$") @@ -169,36 +169,37 @@ local param = MyLilPony.StringMatchIgnoreCase(arg, "^.+ (.+)$"); local result = MyLilPony.ListMountsByPattern(param); if not result then - MyLilPony.Log(format("No matching mounts were found with NAME like '%s'", param)); + MyLilPony.Log(format(L["msgNoMatchingMountsForPattern"], param)); else for _, name in pairs(result) do MyLilPony.Print(name); end + MyLilPony.Print(format(L["msgCountMatchingMountsForPattern"], #result)); end elseif MyLilPony.StringMatchIgnoreCase(arg, "^%d+$") then local result = MyLilPony.CallMountById(tonumber(arg)); if not result then - MyLilPony.Log(format("No matching mounts were found with ID=%s", arg)); + MyLilPony.Log(format(L["msgNoMatchingMountsForId"], arg)); end elseif MyLilPony.StringMatchIgnoreCase(arg, "^.+$") then local result = MyLilPony.CallMountByPattern(arg); if not result then - MyLilPony.Log(format("No matching mounts were found with NAME like '%s'", arg)); + MyLilPony.Log(format(L["msgNoMatchingMountsForPattern"], arg)); end else MyLilPony.Print(format("MyLilPony %s", MYLILPONY_VERSION)); - MyLilPony.Print("Slash Command: /mylilpony (/pony, /mlp)"); - MyLilPony.Print(" /mylilpony auto - Summons a \"suitable\" mount"); - MyLilPony.Print(" /mylilpony random - Summons random mount"); - MyLilPony.Print(" /mylilpony ground - Summons random ground mount"); - MyLilPony.Print(" /mylilpony flying - Summons random flying mount"); - MyLilPony.Print(" /mylilpony aquatic - Summons random aquatic mount"); - MyLilPony.Print(" /mylilpony match - Summons same mount as targeted unit"); - MyLilPony.Print(" /mylilpony [@] match - Summons same mount as specified unit"); - MyLilPony.Print(" /mylilpony list - Lists mounts matching name"); - MyLilPony.Print(" /mylilpony exact - Summons mount by exact name"); - MyLilPony.Print(" /mylilpony - Summons mount by spell or creature ID"); - MyLilPony.Print(" /mylilpony - Summons random mount matching name"); + MyLilPony.Print(L["szCommandHelp"].." (/mylilpony, /pony, /mlp)"); + MyLilPony.Print(" /mylilpony auto - "..L["msgHelpCommandAuto"]); + MyLilPony.Print(" /mylilpony random - "..L["msgHelpCommandRandom"]); + MyLilPony.Print(" /mylilpony ground - "..L["msgHelpCommandGround"]); + MyLilPony.Print(" /mylilpony flying - "..L["msgHelpCommandFlying"]); + MyLilPony.Print(" /mylilpony aquatic - "..L["msgHelpCommandAquatic"]); + MyLilPony.Print(" /mylilpony match - "..L["msgHelpCommandTarget"]); + MyLilPony.Print(" /mylilpony [@] match - "..L["msgHelpCommandMatch"]); + MyLilPony.Print(" /mylilpony list - "..L["msgHelpCommandList"]); + MyLilPony.Print(" /mylilpony exact - "..L["msgHelpCommandExact"]); + MyLilPony.Print(" /mylilpony - "..L["msgHelpCommandId"]); + MyLilPony.Print(" /mylilpony - "..L["msgHelpCommandName"]); end end diff -r 37f948cacc7d -r 1d9a8aa6d72e MyLilPony.toc --- a/MyLilPony.toc Sat Apr 30 21:54:01 2011 +0000 +++ b/MyLilPony.toc Sat Apr 30 22:26:16 2011 +0000 @@ -12,4 +12,6 @@ libMyLilPony\libMyLilPony_miscFunctions.lua # MyLilPony +locales\enUS.lua +locales\frFR.lua MyLilPony.lua diff -r 37f948cacc7d -r 1d9a8aa6d72e locales/enUS.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locales/enUS.lua Sat Apr 30 22:26:16 2011 +0000 @@ -0,0 +1,43 @@ +-- Copyright (c) 2011, Syzler +-- All rights reserved. +-- +-- Redistribution and use in source and binary forms, with or without +-- modification, are permitted provided that the following conditions +-- are met: +-- +-- * Redistributions of source code must retain the above copyright +-- notice, this list of conditions and the following disclaimer. +-- * Redistributions in binary form must reproduce the above copyright +-- notice, this list of conditions and the following disclaimer in +-- the documentation and/or other materials provided with the +-- distribution. +-- * Neither the name of the MyLilPony Project nor the names of its +-- contributors may be used to endorse or promote products derived +-- from this software without specific prior written permission. +-- +-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +-- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +-- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +-- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +-- COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +-- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +-- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +-- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +-- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +-- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +-- POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------ +-- Project: MyLilPony +-- Project Version: @project-version@ +-- Last Author: @file-author@ +-- Last Updated: @file-date-iso@ +-- +-- en-US localizations for main addon +-- This file is auto-generated using the Curse Localization App +------------------------------------------------------------------------ + +L = {}; + +@localization(locale="enUS", format="lua_additive_table", table-name="L", namespace="", handle-subnamespaces="none")@ diff -r 37f948cacc7d -r 1d9a8aa6d72e locales/frFR.lua --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locales/frFR.lua Sat Apr 30 22:26:16 2011 +0000 @@ -0,0 +1,43 @@ +-- Copyright (c) 2011, Syzler +-- All rights reserved. +-- +-- Redistribution and use in source and binary forms, with or without +-- modification, are permitted provided that the following conditions +-- are met: +-- +-- * Redistributions of source code must retain the above copyright +-- notice, this list of conditions and the following disclaimer. +-- * Redistributions in binary form must reproduce the above copyright +-- notice, this list of conditions and the following disclaimer in +-- the documentation and/or other materials provided with the +-- distribution. +-- * Neither the name of the MyLilPony Project nor the names of its +-- contributors may be used to endorse or promote products derived +-- from this software without specific prior written permission. +-- +-- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +-- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +-- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +-- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +-- COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +-- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +-- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +-- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +-- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +-- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +-- POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------ +-- Project: MyLilPony +-- Project Version: @project-version@ +-- Last Author: @file-author@ +-- Last Updated: @file-date-iso@ +-- +-- fr-FR localizations for main addon +-- This file is auto-generated using the Curse Localization App +------------------------------------------------------------------------ + +if GetLocale() ~= "frFR" then return end + +@localization(locale="frFR", format="lua_additive_table", table-name="L", namespace="", handle-subnamespaces="none")@