coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc/Fixup

Browse source 
* floating changes
 * condense several switch() into match() constructs
 * fix ucFirst not making the rest of the word lowercase
This commit is contained in:
Sarjuuk 2025-04-02 22:19:52 +02:00
parent 44ff43c113
commit 3078763ec3
5 changed files with 53 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

60
localization/lang.class.php
View file

@ -409,6 +409,7 @@ class Lang
if ($short && $schoolMask == SPELL_ALL_SCHOOLS)
return self::main('all');
if ($short && $schoolMask == SPELL_MAGIC_SCHOOLS)
return self::main('all').' ('.self::game('dt', 1).')';
@ -429,27 +430,18 @@ class Lang
{
$classMask &= ChrClass::MASK_ALL; // clamp to available classes..
if ($classMask == ChrClass::MASK_ALL) // available to all classes
if (!$classMask || $classMask == ChrClass::MASK_ALL)// available to all classes
return '';
$tmp = [];
switch ($fmt)
[$base, $br] = match ($fmt)
{
case self::FMT_HTML:
$base = '<a href="?class=%1$d" class="c%1$d">%2$s</a>';
$br = '';
break;
case self::FMT_MARKUP:
$base = '[class=%1$d]';
$br = '[br]';
break;
case self::FMT_RAW:
default:
$base = '%2$s';
$br = '';
}
self::FMT_HTML => ['<a href="?class=%1$d" class="c%1$d">%2$s</a>', ''],
self::FMT_MARKUP => ['[class=%1$d]', '[br]'],
self::FMT_RAW => ['%2$s', ''],
default => ['%2$s', '']
};
$tmp = [];
foreach (ChrClass::fromMask($classMask) as $c)
$tmp[$c] = (!fMod(count($tmp) + 1, 3) ? $br : null).sprintf($base, $c, self::game('cl', $c));
@ -462,38 +454,26 @@ class Lang
{
$raceMask &= ChrRace::MASK_ALL; // clamp to available races..
if ($raceMask == ChrRace::MASK_ALL) // available to all races (we don't display 'both factions')
if (!$raceMask || $raceMask == ChrRace::MASK_ALL) // available to all races (we don't display 'both factions')
return '';
if (!$raceMask)
return '';
$tmp = [];
switch ($fmt)
{
case self::FMT_HTML:
$base = '<a href="?race=%1$d" class="q1">%2$s</a>';
$br = '';
break;
case self::FMT_MARKUP:
$base = '[race=%1$d]';
$br = '[br]';
break;
case self::FMT_RAW:
default:
$base = '%2$s';
$br = '';
}
if ($raceMask == ChrRace::MASK_HORDE)
return self::game('ra', -2);
if ($raceMask == ChrRace::MASK_ALLIANCE)
return self::game('ra', -1);
[$base, $br] = match ($fmt)
{
self::FMT_HTML => ['<a href="?race=%1$d" class="q1">%2$s</a>', ''],
self::FMT_MARKUP => ['[race=%1$d]', '[br]'],
self::FMT_RAW => ['%2$s', ''],
default => ['%2$s', '']
};
$tmp = [];
foreach (ChrRace::fromMask($raceMask) as $r)
$tmp[$r] = (!fMod(count($tmp) + 1, 3) ? $br : null).sprintf($base, $r, self::game('ra', $r));
$tmp[$r] = (!fMod(count($tmp) + 1, 3) ? $br : '').sprintf($base, $r, self::game('ra', $r));
$ids = array_keys($tmp);