Skip to content

Commit

Permalink
Fix 50 typos in the rest of the code (Mudlet#5389)
Browse files Browse the repository at this point in the history
  • Loading branch information
vadi2 authored Aug 22, 2021
1 parent 1f90e64 commit e595ba7
Show file tree
Hide file tree
Showing 15 changed files with 56 additions and 56 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/library-scripts/desktop-lite-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export DEBIAN_FRONTEND=noninteractive

apt-get-update-if-needed

# On older Ubuntu, Tilix is in a PPA. On Debian Strech, its in backports
# On older Ubuntu, Tilix is in a PPA. On Debian Stretch, its in backports
if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
apt-get install -y --no-install-recommends lsb-release
if [ "$(lsb_release -is)" = "Ubuntu" ]; then
Expand Down Expand Up @@ -261,7 +261,7 @@ startInBackgroundIfNotRunning "x11vnc" sudoIf "x11vnc -display \${DISPLAY:-:1} -
# Set resolution
/usr/local/bin/set-resolution \${VNC_RESOLUTION:-1440x768} \${VNC_DPI:-96} true
# Spin up noVNC if installed and not runnning.
# Spin up noVNC if installed and not running.
if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen \${NOVNC_PORT:-6080} --vnc localhost:\${VNC_PORT:-5901}"
log "noVNC started."
Expand Down
2 changes: 1 addition & 1 deletion CI/appveyor.after_success.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $Script:PublicTestBuild) {
New-Item "$SQUIRRELWINBIN" -ItemType "directory"
}

Write-Output "=== Moving things to where Squirel expects them ==="
Write-Output "=== Moving things to where Squirrel expects them ==="
# move everything into src\release\squirrel.windows\lib\net45\ as that's where Squirrel would like to see it
Move-Item $Env:APPVEYOR_BUILD_FOLDER\src\release\* $SQUIRRELWINBIN

Expand Down
2 changes: 1 addition & 1 deletion CI/travis.osx.install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set +e
shopt -s expand_aliases
#Removed boost as first item as a temporary workaroud to prevent trying to
#Removed boost as first item as a temporary workaround to prevent trying to
#upgrade to boost version 1.68.0 which has not been bottled yet...
BREWS="luarocks cmake hunspell libzip lua51 pcre pkg-config qt5 yajl ccache pugixml"
OUTDATED_BREWS=$(brew outdated)
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindZZIPLIB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Break each step into a separate command so any status message is output
# straight away The include directory setup for Zip is unusual in that as well
# as e.g. /usr/include/zip.h we need the path to an interal header zipconf.g
# as e.g. /usr/include/zip.h we need the path to an internal header zipconf.g
# that it calls for using '<''>'s i.e. SYSTEM #include delimiters which are
# typically located at e.g. /usr/lib/libzip/include/zipconf.h and using pkg-
# config is the recommended way to get the details. Spotted recommendation to
Expand Down
26 changes: 13 additions & 13 deletions src/mudlet-lua/lua/generic-mapper/generic_mapper.xml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ setTriggerStayOpen("English Multi-Line Exits Trigger",1)</script>
</regexCodePropertyList>
</Trigger>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>Russion Vision Fail Trigger</name>
<name>Russian Vision Fail Trigger</name>
<script>raiseEvent("onVisionFail")</script>
<triggerType>0</triggerType>
<conditonLineDelta>0</conditonLineDelta>
Expand Down Expand Up @@ -1069,7 +1069,7 @@ map.help.path = [[

This command tries to find a walking path from the current room to the
named room. If an area name is given, only rooms within that area that
is given are checked. Neither the room name nore the area name are case
is given are checked. Neither the room name nor the area name are case
sensitive, but otherwise an exact match is required. Note that a
semicolon is required between the room name and area name, if an area
name is given, but spaces before or after the semicolon are optional.
Expand Down Expand Up @@ -1137,15 +1137,15 @@ map.help.config = [[
&lt;yellow&gt;search_on_look&lt;reset&gt; - When this is set, using the "look" command causes
the map to verify your position using the room name and exits
seen following using the command. This may be true or false.

&lt;yellow&gt;clear_lines_on_send&lt;reset&gt; - When this is set, any time a command is sent,
any lines stored from the game used to search for the room name
are cleared. This may be true or false.

&lt;yellow&gt;mode&lt;reset&gt; - This is the default mapping mode on startup, and defines how
new rooms are added to the map. May be "lazy", "simple",
"normal" or "complex".

&lt;yellow&gt;download_path&lt;reset&gt; - This is the path that updates are downloaded from.
This may be any web address where the versions.lua and
generic_mapper.xml files can be downloaded from.
Expand All @@ -1167,7 +1167,7 @@ map.help.config = [[
&lt;yellow&gt;custom_name_search&lt;reset&gt; - When this is set, instead of running the default
function name_search, a user-defined function called
'mudlet.custom_name_search' is used instead. This may be true or false.

&lt;yellow&gt;use_translation&lt;reset&gt; - When this is set, the lang_dirs table is used to
translate movement and status commands in some other language
into the English used by the script. This may be true or false.
Expand Down Expand Up @@ -1594,7 +1594,7 @@ local function add_door(roomID, dir, status)
end
if type(status) ~= "number" then
status = assert(table.index_of({"none","open","closed","locked"},status),
"Add Door: Invald status, must be none, open, closed, or locked") - 1
"Add Door: Invalid status, must be none, open, closed, or locked") - 1
end
local exits = getRoomExits(roomID)
-- check handling of custom exits here
Expand Down Expand Up @@ -1722,10 +1722,10 @@ local function check_room(roomID, name, exits, onlyName)
error("Check Room Error: No ID",2)
end
if name ~= getRoomName(roomID) then return false end

-- used in mode "lazy" to match only the room name
if onlyName then return true end

local t_exits = table.union(getRoomExits(roomID),getRoomStubs(roomID))
-- check handling of custom exits here
for i = 13,#stubmap do
Expand Down Expand Up @@ -1862,7 +1862,7 @@ local function find_link(name, exits, dir, max_distance)
for k,v in pairs(rooms) do
if check_room(v,name,exits,false) then
match = v
break
break
elseif map.mode == "lazy" and check_room(v,name,exits,true) then
match = v
break
Expand Down Expand Up @@ -1917,7 +1917,7 @@ local function move_map()
onlyName = true
else
onlyName = false
end
end
if exits[move] and (vision_fail or check_room(exits[move], map.currentName, map.currentExits, onlyName)) then
set_room(exits[move])
elseif special[move] and (vision_fail or check_room(special[move], map.currentName, map.currentExits, onlyName)) then
Expand Down Expand Up @@ -2938,11 +2938,11 @@ end
function map.sanitizeRoomName(roomtitle)
assert(type(roomtitle) == "string", "map.sanitizeRoomName: bad argument #1 expected room title, got "..type(roomtitle).."!")
if not roomtitle:match(" ") then return roomtitle end

local parts = roomtitle:split(" ")
table.sort(parts, function(a,b) return #a &lt; #b end)
local longestpart = parts[#parts]

local trimmed = utf8.match(longestpart, "[%w ]+"):trim()
return trimmed
end
Expand Down Expand Up @@ -3015,7 +3015,7 @@ function map.eventHandler(event, ...)
end
end
end

map.registeredEvents = {
registerAnonymousEventHandler("sysDownloadDone", "map.eventHandler"),
registerAnonymousEventHandler("sysLoadEvent", "map.eventHandler"),
Expand Down
20 changes: 10 additions & 10 deletions src/mudlet-mapper.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2543,7 +2543,7 @@ cecho("&lt;orange_red&gt;)")</script>
<regexCodeList />
<regexCodePropertyList />
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>Succesful transverse</name>
<name>Successful transverse</name>
<script>if mmp.game~= "lusternia" then return end
if validTransverse then
mmp.registerTransverseExit()
Expand Down Expand Up @@ -2588,7 +2588,7 @@ validTransverse = false</script>
</regexCodePropertyList>
</Trigger>
<Trigger isActive="yes" isFolder="no" isTempTrigger="no" isMultiline="no" isPerlSlashGOption="no" isColorizerTrigger="no" isFilterTrigger="no" isSoundTrigger="no" isColorTrigger="no" isColorTriggerFg="no" isColorTriggerBg="no">
<name>Succesful pathfind</name>
<name>Successful pathfind</name>
<script>if mmp.game~= "lusternia" then return end
if validTransverse then
mmp.clearPathfind()
Expand Down Expand Up @@ -3500,7 +3500,7 @@ mmp.echo("We're connected to StickMUD.")</script>
<colorTriggerFgColor>#000000</colorTriggerFgColor>
<colorTriggerBgColor>#000000</colorTriggerBgColor>
<regexCodeList>
<string>^The door to the (\w+) is closed forcefully fromthe other side and the sound of a bolt being slammed home makes your lack of admittance clear\.$</string>
<string>^The door to the (\w+) is closed forcefully from the other side and the sound of a bolt being slammed home makes your lack of admittance clear\.$</string>
</regexCodeList>
<regexCodePropertyList>
<integer>1</integer>
Expand Down Expand Up @@ -4714,7 +4714,7 @@ for key in pairs(getRooms()) do
if char ~= "" then
if translation[char] then
if not mmp.roomCreateMapFeature(translation[char], key) then
mmp.echo("An error occured when migrating room characters, see messages above for details. Migration incomplete!")
mmp.echo("An error occurred when migrating room characters, see messages above for details. Migration incomplete!")
return
end
end
Expand Down Expand Up @@ -5460,7 +5460,7 @@ mmp.lagtable = {
time = 1
},
[3] = {
description = "Noticably laggy with occasional spikes.",
description = "Noticeably laggy with occasional spikes.",
time = 2
},
[4] = {
Expand Down Expand Up @@ -6512,7 +6512,7 @@ function mmp.fixPath(rFrom, rTo, dashtype)
end
end
if repCount &gt; 1 then
-- Found direction repitition. Calculate dash path.
-- Found direction repetition. Calculate dash path.
local exits = getRoomExits(mmp.speedWalkPath[index + (repCount - 1)])
local pname = ""
for word in mmp.speedWalkDir[index]:gmatch("%w") do
Expand Down Expand Up @@ -8209,7 +8209,7 @@ function mmp.roomLabel(input)
if tk[1] and color_table[tk[1]] then
fg = table.remove(tk, 1)
end
-- next: is this a backround color?
-- next: is this a background color?
if tk[1] and color_table[tk[1]] then
bg = table.remove(tk, 1)
end
Expand Down Expand Up @@ -9992,7 +9992,7 @@ function mmp_mapping_newroom(_, num)
s ..
(#s &gt; 0 and " " or "") ..
string.format(
"Failed to link %d withh %d via %s exit for some reason :/", num, id, exit
"Failed to link %d with %d via %s exit for some reason :/", num, id, exit
)
end
end
Expand Down Expand Up @@ -10045,7 +10045,7 @@ function mmp_mapping_newroom(_, num)
s ..
(#s &gt; 0 and " " or "") ..
string.format(
"Failed to link %d withh %d via %s exit for some reason :/", num, id, exit
"Failed to link %d with %d via %s exit for some reason :/", num, id, exit
)
end
local exit = mmp.anytoshort(mmp.ranytolong(exit))
Expand All @@ -10065,7 +10065,7 @@ function mmp_mapping_newroom(_, num)
s ..
(#s &gt; 0 and " " or "") ..
string.format(
"Failed to link %d withh %d via %s exit for some reason :/", num, id, exit
"Failed to link %d with %d via %s exit for some reason :/", num, id, exit
)
end
end
Expand Down
12 changes: 6 additions & 6 deletions src/mudlet.pro
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ isEmpty( FONT_TEST ) | !equals(FONT_TEST, "NO" ) {
# It would be nice if we could automate the download and extraction of all
# the font and associate documentation (but NOT the "sources" sub-directory)
# contents into the ./src/fonts/ directory structure only if this option is
# set to ON; however that would be plaform specific and add more complexity
# and it is not obvious that there is a demand to do this currenly.
# set to ON; however that would be platform specific and add more complexity
# and it is not obvious that there is a demand to do this currently.
}

######################### Auto Updater setting detection #########,#############
Expand Down Expand Up @@ -215,7 +215,7 @@ isEmpty( MAIN_BUILD_SYSTEM_TEST ) | !equals( MAIN_BUILD_SYSTEM_TEST, "NO" ) {
# below, if this is not done then a hardcoded default of a ./mudlet-lua/lua
# from the executable's location will be used. Mudlet will now moan and ask
# the user to find them if the files (and specifically the <10KByte
# "LuaGlobal.lua" one) is not accessable (read access only required) during
# "LuaGlobal.lua" one) is not accessible (read access only required) during
# startup. The precise directory is remembered once found (and stored in the
# Mudlet configuration file as "systemLuaFilePath") but if the installer places
# the files in the place documented here the user will not be bothered by this.
Expand Down Expand Up @@ -490,7 +490,7 @@ contains( DEFINES, INCLUDE_UPDATER ) {

macx {
# We do not actually have to do anything to include it here - it is
# pulled in by the Sparkle complation below
# pulled in by the Sparkle compilation below
!exists("$${PWD}/../3rdparty/sparkle-glue/mixing-cocoa-and-qt.pro") {
error("Cannot locate Sparkle glue library submodule source code, build abandoned!")
}
Expand Down Expand Up @@ -840,7 +840,7 @@ TRANSLATIONS = $$files(../translations/translated/*.ts)
#
# Select Qt Creator's "Project" Side tab and under the "Build and Run" top tab
# choose your Build Kit's "Run"->"Run Settings" ensure you have a "Make" step
# that - if you are NOT runnning QT Creator as root, which is the safest way
# that - if you are NOT running QT Creator as root, which is the safest way
# (i.e safe = NOT root) - against:
# "Override <path to?>/make" has the entry: "/usr/bin/sudo"
# without the quotes, assuming /usr/bin is the location of "sudo"
Expand Down Expand Up @@ -1483,7 +1483,7 @@ OTHER_FILES += \

# Unix Makefile installer:
# lua file installation, needs install, sudo, and a setting in /etc/sudo.conf
# or via enviromental variable SUDO_ASKPASS to something like ssh-askpass
# or via environmental variable SUDO_ASKPASS to something like ssh-askpass
# to provide a graphic password requestor needed to install software
unix:!macx {
# say what we want to get installed by "make install" (executed by 'deployment' step):
Expand Down
Loading

0 comments on commit e595ba7

Please sign in to comment.