Skip to content

Bugfix for path related issue #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 14, 2025
Merged

Bugfix for path related issue #527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c356a26
Bugfix for path related issue
lloc Oct 14, 2025
800259e
CSS adjusted
lloc Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions assets/css/flags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,19 @@
'zh_HK' => 'flag-icon-hk',
];

/**
* 168 unused icons in assets/css-flags/flags/4x3/
*
* /css-flags/flags/4x3/ad.svg, /css-flags/flags/4x3/ae.svg, /css-flags/flags/4x3/ag.svg, /css-flags/flags/4x3/ai.svg, /css-flags/flags/4x3/aq.svg, /css-flags/flags/4x3/as.svg, /css-flags/flags/4x3/aw.svg, /css-flags/flags/4x3/ax.svg, /css-flags/flags/4x3/bb.svg, /css-flags/flags/4x3/bf.svg, /css-flags/flags/4x3/bh.svg, /css-flags/flags/4x3/bi.svg, /css-flags/flags/4x3/bj.svg, /css-flags/flags/4x3/bl.svg, /css-flags/flags/4x3/bm.svg
* /css-flags/flags/4x3/bn.svg, /css-flags/flags/4x3/bo.svg, /css-flags/flags/4x3/bq.svg, /css-flags/flags/4x3/bs.svg, /css-flags/flags/4x3/bv.svg, /css-flags/flags/4x3/bw.svg, /css-flags/flags/4x3/bz.svg, /css-flags/flags/4x3/cc.svg, /css-flags/flags/4x3/cd.svg, /css-flags/flags/4x3/cf.svg, /css-flags/flags/4x3/cg.svg, /css-flags/flags/4x3/ci.svg, /css-flags/flags/4x3/ck.svg, /css-flags/flags/4x3/cm.svg, /css-flags/flags/4x3/cu.svg
* /css-flags/flags/4x3/cv.svg, /css-flags/flags/4x3/cw.svg, /css-flags/flags/4x3/cx.svg, /css-flags/flags/4x3/cy.svg, /css-flags/flags/4x3/dj.svg, /css-flags/flags/4x3/dm.svg, /css-flags/flags/4x3/eg.svg, /css-flags/flags/4x3/eh.svg, /css-flags/flags/4x3/er.svg, /css-flags/flags/4x3/et.svg, /css-flags/flags/4x3/fj.svg, /css-flags/flags/4x3/fk.svg, /css-flags/flags/4x3/fm.svg, /css-flags/flags/4x3/fo.svg, /css-flags/flags/4x3/ga.svg
* /css-flags/flags/4x3/gb-eng.svg, /css-flags/flags/4x3/gb-nir.svg, /css-flags/flags/4x3/gd.svg, /css-flags/flags/4x3/gf.svg, /css-flags/flags/4x3/gg.svg, /css-flags/flags/4x3/gh.svg, /css-flags/flags/4x3/gi.svg, /css-flags/flags/4x3/gl.svg, /css-flags/flags/4x3/gm.svg, /css-flags/flags/4x3/gn.svg, /css-flags/flags/4x3/gp.svg, /css-flags/flags/4x3/gq.svg, /css-flags/flags/4x3/gs.svg, /css-flags/flags/4x3/gu.svg, /css-flags/flags/4x3/gw.svg
* /css-flags/flags/4x3/gy.svg, /css-flags/flags/4x3/hm.svg, /css-flags/flags/4x3/hn.svg, /css-flags/flags/4x3/ht.svg, /css-flags/flags/4x3/ie.svg, /css-flags/flags/4x3/im.svg, /css-flags/flags/4x3/io.svg, /css-flags/flags/4x3/je.svg, /css-flags/flags/4x3/jm.svg, /css-flags/flags/4x3/jo.svg, /css-flags/flags/4x3/ke.svg, /css-flags/flags/4x3/kg.svg, /css-flags/flags/4x3/ki.svg, /css-flags/flags/4x3/km.svg, /css-flags/flags/4x3/kn.svg
* /css-flags/flags/4x3/kp.svg, /css-flags/flags/4x3/kw.svg, /css-flags/flags/4x3/ky.svg, /css-flags/flags/4x3/lb.svg, /css-flags/flags/4x3/lc.svg, /css-flags/flags/4x3/li.svg, /css-flags/flags/4x3/lr.svg, /css-flags/flags/4x3/ls.svg, /css-flags/flags/4x3/lu.svg, /css-flags/flags/4x3/ly.svg, /css-flags/flags/4x3/mc.svg, /css-flags/flags/4x3/md.svg, /css-flags/flags/4x3/me.svg, /css-flags/flags/4x3/mf.svg, /css-flags/flags/4x3/mg.svg
* /css-flags/flags/4x3/mh.svg, /css-flags/flags/4x3/ml.svg, /css-flags/flags/4x3/mo.svg, /css-flags/flags/4x3/mp.svg, /css-flags/flags/4x3/mq.svg, /css-flags/flags/4x3/mr.svg, /css-flags/flags/4x3/ms.svg, /css-flags/flags/4x3/mt.svg, /css-flags/flags/4x3/mu.svg, /css-flags/flags/4x3/mv.svg, /css-flags/flags/4x3/mw.svg, /css-flags/flags/4x3/mz.svg, /css-flags/flags/4x3/na.svg, /css-flags/flags/4x3/nc.svg, /css-flags/flags/4x3/ne.svg
* /css-flags/flags/4x3/nf.svg, /css-flags/flags/4x3/ng.svg, /css-flags/flags/4x3/ni.svg, /css-flags/flags/4x3/nr.svg, /css-flags/flags/4x3/nu.svg, /css-flags/flags/4x3/om.svg, /css-flags/flags/4x3/pa.svg, /css-flags/flags/4x3/pg.svg, /css-flags/flags/4x3/pm.svg, /css-flags/flags/4x3/pn.svg, /css-flags/flags/4x3/ps.svg, /css-flags/flags/4x3/pw.svg, /css-flags/flags/4x3/py.svg, /css-flags/flags/4x3/qa.svg, /css-flags/flags/4x3/re.svg
* /css-flags/flags/4x3/rw.svg, /css-flags/flags/4x3/sa.svg, /css-flags/flags/4x3/sb.svg, /css-flags/flags/4x3/sc.svg, /css-flags/flags/4x3/sd.svg, /css-flags/flags/4x3/sg.svg, /css-flags/flags/4x3/sh.svg, /css-flags/flags/4x3/sj.svg, /css-flags/flags/4x3/sl.svg, /css-flags/flags/4x3/sm.svg, /css-flags/flags/4x3/sn.svg, /css-flags/flags/4x3/so.svg, /css-flags/flags/4x3/sr.svg, /css-flags/flags/4x3/ss.svg, /css-flags/flags/4x3/st.svg
* /css-flags/flags/4x3/sv.svg, /css-flags/flags/4x3/sx.svg, /css-flags/flags/4x3/sy.svg, /css-flags/flags/4x3/sz.svg, /css-flags/flags/4x3/tc.svg, /css-flags/flags/4x3/td.svg, /css-flags/flags/4x3/tf.svg, /css-flags/flags/4x3/tg.svg, /css-flags/flags/4x3/tj.svg, /css-flags/flags/4x3/tk.svg, /css-flags/flags/4x3/tl.svg, /css-flags/flags/4x3/tm.svg, /css-flags/flags/4x3/tn.svg, /css-flags/flags/4x3/to.svg, /css-flags/flags/4x3/tt.svg
* /css-flags/flags/4x3/tv.svg, /css-flags/flags/4x3/tz.svg, /css-flags/flags/4x3/ug.svg, /css-flags/flags/4x3/um.svg, /css-flags/flags/4x3/un.svg, /css-flags/flags/4x3/us.svg, /css-flags/flags/4x3/va.svg, /css-flags/flags/4x3/vc.svg, /css-flags/flags/4x3/vg.svg, /css-flags/flags/4x3/vi.svg, /css-flags/flags/4x3/vu.svg, /css-flags/flags/4x3/wf.svg, /css-flags/flags/4x3/ws.svg, /css-flags/flags/4x3/xk.svg, /css-flags/flags/4x3/ye.svg
* /css-flags/flags/4x3/yt.svg, /css-flags/flags/4x3/zm.svg, /css-flags/flags/4x3/zw.svg
*/
15 changes: 15 additions & 0 deletions assets/flags/flags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,18 @@
'zh_HK' => 'hk.png',
];

/**
* 158 unused icons in flags/
*
* /flags/ad.png, /flags/ae.png, /flags/ag.png, /flags/ai.png, /flags/an.png, /flags/as.png, /flags/aw.png, /flags/ax.png, /flags/bb.png, /flags/bf.png, /flags/bh.png, /flags/bi.png, /flags/bj.png, /flags/bm.png, /flags/bn.png
* /flags/bo.png, /flags/bs.png, /flags/bv.png, /flags/bw.png, /flags/bz.png, /flags/cc.png, /flags/cd.png, /flags/cf.png, /flags/cg.png, /flags/ci.png, /flags/ck.png, /flags/cm.png, /flags/cs.png, /flags/cu.png, /flags/cv.png
* /flags/cx.png, /flags/cy.png, /flags/dj.png, /flags/dm.png, /flags/eg.png, /flags/eh.png, /flags/england.png, /flags/er.png, /flags/et.png, /flags/fam.png, /flags/fj.png, /flags/fk.png, /flags/fm.png, /flags/fo.png, /flags/ga.png
* /flags/gd.png, /flags/gf.png, /flags/gh.png, /flags/gi.png, /flags/gl.png, /flags/gm.png, /flags/gn.png, /flags/gp.png, /flags/gq.png, /flags/gs.png, /flags/gu.png, /flags/gw.png, /flags/gy.png, /flags/hm.png, /flags/hn.png
* /flags/ht.png, /flags/ie.png, /flags/io.png, /flags/jm.png, /flags/jo.png, /flags/ke.png, /flags/kg.png, /flags/ki.png, /flags/km.png, /flags/kn.png, /flags/kp.png, /flags/kw.png, /flags/ky.png, /flags/lb.png, /flags/lc.png
* /flags/li.png, /flags/lr.png, /flags/ls.png, /flags/lu.png, /flags/ly.png, /flags/mc.png, /flags/md.png, /flags/me.png, /flags/mg.png, /flags/mh.png, /flags/ml.png, /flags/mo.png, /flags/mp.png, /flags/mq.png, /flags/mr.png
* /flags/ms.png, /flags/mt.png, /flags/mu.png, /flags/mv.png, /flags/mw.png, /flags/mz.png, /flags/na.png, /flags/nc.png, /flags/ne.png, /flags/nf.png, /flags/ng.png, /flags/ni.png, /flags/nr.png, /flags/nu.png, /flags/om.png
* /flags/pa.png, /flags/pg.png, /flags/pm.png, /flags/pn.png, /flags/ps.png, /flags/pw.png, /flags/py.png, /flags/qa.png, /flags/re.png, /flags/rw.png, /flags/sa.png, /flags/sb.png, /flags/sc.png, /flags/sd.png, /flags/sg.png
* /flags/sh.png, /flags/sj.png, /flags/sl.png, /flags/sm.png, /flags/sn.png, /flags/so.png, /flags/sr.png, /flags/st.png, /flags/sv.png, /flags/sy.png, /flags/sz.png, /flags/tc.png, /flags/td.png, /flags/tf.png, /flags/tg.png
* /flags/tj.png, /flags/tk.png, /flags/tl.png, /flags/tm.png, /flags/tn.png, /flags/to.png, /flags/tt.png, /flags/tv.png, /flags/tz.png, /flags/ug.png, /flags/um.png, /flags/us.png, /flags/va.png, /flags/vc.png, /flags/vg.png
* /flags/vi.png, /flags/vu.png, /flags/wf.png, /flags/ws.png, /flags/ye.png, /flags/yt.png, /flags/zm.png, /flags/zw.png
*/
4 changes: 2 additions & 2 deletions bin/flags-png.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/
$content = file_get_contents( 'build/translations.json' );
$json = json_decode( $content );
$glob = glob( 'flags/*.png' );
$glob = glob( 'assets/flags/*.png' );
$icons = $not_found = array();
$exceptions = array(
'ca' => 'catalonia.png',
Expand Down Expand Up @@ -107,7 +107,7 @@
echo 'return $flags = [', PHP_EOL;

foreach ( array_filter( $icons ) as $key => $value ) {
$needle = "flags/{$value}";
$needle = "assets/flags/{$value}";
$index = array_search( $needle, $glob );
if ( $index !== false ) {
unset( $glob[ $index ] );
Expand Down
6 changes: 3 additions & 3 deletions bin/flags-svg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/
$content = file_get_contents( 'build/translations.json' );
$json = json_decode( $content );
$glob = glob( 'css-flags/flags/4x3/*.svg' );
$glob = glob( 'assets/css-flags/flags/4x3/*.svg' );
$exceptions = array(
'ca' => 'es-ca',
'eo' => 'eu',
Expand Down Expand Up @@ -107,7 +107,7 @@
echo 'return $className = [', PHP_EOL;

foreach ( array_filter( $icons ) as $key => $value ) {
$needle = "css-flags/flags/4x3/{$value}.svg";
$needle = "assets/css-flags/flags/4x3/{$value}.svg";
$index = array_search( $needle, $glob );
if ( $index !== false ) {
unset( $glob[ $index ] );
Expand All @@ -119,7 +119,7 @@

$count = count( $glob );
if ( $count > 0 ) {
echo '/**', PHP_EOL, " * {$count} unused icons in css-flags/flags/4x3/", PHP_EOL, ' * ', PHP_EOL;
echo '/**', PHP_EOL, " * {$count} unused icons in assets/css-flags/flags/4x3/", PHP_EOL, ' * ', PHP_EOL;

array_walk(
$glob,
Expand Down
2 changes: 1 addition & 1 deletion build/translations.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/MslsOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public function get_icon( $language ) {
* @return string
*/
public function get_flag_url( $language ) {
$url = ! is_admin() && isset( $this->image_url ) ? $this->__get( 'image_url' ) : $this->get_url( 'flags' );
$url = ! is_admin() && isset( $this->image_url ) ? $this->__get( 'image_url' ) : $this->get_url( 'assets/flags' );

/**
* Override the path to the flag-icons
Expand Down
Loading