kopia lustrzana https://github.com/hholzgra/maposmatic/
replace deprecated npm flag-icon-css with successor flag-icons
rodzic
ff3440ebba
commit
4aab68839b
|
@ -81,7 +81,7 @@ class MapRenderingJobForm(forms.ModelForm):
|
|||
map_lang_flag_list.append((lang_key, lang_name))
|
||||
else:
|
||||
country_code = lang_key[3:5].lower()
|
||||
lang_html = mark_safe("<span class='flag-icon flag-icon-%s'> </span> %s"
|
||||
lang_html = mark_safe("<span class='fi fi-%s'> </span> %s"
|
||||
% (country_code, lang_name))
|
||||
map_lang_flag_list.append((lang_key, lang_html))
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@
|
|||
<link rel="stylesheet" href="/media/node_modules/fastselect/dist/fastselect.css" />
|
||||
<script src="/media/node_modules/fastselect/dist/fastselect.js"></script>
|
||||
|
||||
<link rel="stylesheet" href="/media/node_modules/flag-icon-css/css/flag-icon.min.css" />
|
||||
<link rel="stylesheet" href="/media/node_modules/flag-icons/css/flag-icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="/media/css/maposmatic.css" />
|
||||
|
||||
|
|
|
@ -118,7 +118,7 @@ def bbox_km(value):
|
|||
def language_flag(value):
|
||||
if value in www.settings.LANGUAGE_FLAGS:
|
||||
if www.settings.LANGUAGE_FLAGS[value] != None:
|
||||
return ("flag-icon flag-icon-%s" % www.settings.LANGUAGE_FLAGS[value])
|
||||
return ("fi fi-%s" % www.settings.LANGUAGE_FLAGS[value])
|
||||
return "fa fa-flag"
|
||||
|
||||
def locale_base(value):
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
"bootstrap-material-design": "^4.1.3",
|
||||
"fastsearch": "^1.11.1",
|
||||
"fastselect": "^0.7.3",
|
||||
"flag-icon-css": "^3.3.0",
|
||||
"flag-icons": "^6.6.6",
|
||||
"jquery": "^3.5.1",
|
||||
"leaflet": "^1.4.0",
|
||||
"leaflet-easybutton": "^2.4.0",
|
||||
|
@ -511,11 +511,10 @@
|
|||
"jquery": ">=1.7"
|
||||
}
|
||||
},
|
||||
"node_modules/flag-icon-css": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/flag-icon-css/-/flag-icon-css-3.5.0.tgz",
|
||||
"integrity": "sha512-pgJnJLrtb0tcDgU1fzGaQXmR8h++nXvILJ+r5SmOXaaL/2pocunQo2a8TAXhjQnBpRLPtZ1KCz/TYpqeNuE2ew==",
|
||||
"deprecated": "The project has been renamed to flag-icons"
|
||||
"node_modules/flag-icons": {
|
||||
"version": "6.6.6",
|
||||
"resolved": "https://registry.npmjs.org/flag-icons/-/flag-icons-6.6.6.tgz",
|
||||
"integrity": "sha512-4lHDKxldnQ7q617pf9Dx9nAetT+9zcMpUexbRrc9kjLw9KJgZ83zA5Dky3Vv7ZDzUjAiZ46x/cy5P0HnEnqA2A=="
|
||||
},
|
||||
"node_modules/foreach": {
|
||||
"version": "2.0.5",
|
||||
|
@ -1568,10 +1567,10 @@
|
|||
"jquery": ">=1.7"
|
||||
}
|
||||
},
|
||||
"flag-icon-css": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/flag-icon-css/-/flag-icon-css-3.5.0.tgz",
|
||||
"integrity": "sha512-pgJnJLrtb0tcDgU1fzGaQXmR8h++nXvILJ+r5SmOXaaL/2pocunQo2a8TAXhjQnBpRLPtZ1KCz/TYpqeNuE2ew=="
|
||||
"flag-icons": {
|
||||
"version": "6.6.6",
|
||||
"resolved": "https://registry.npmjs.org/flag-icons/-/flag-icons-6.6.6.tgz",
|
||||
"integrity": "sha512-4lHDKxldnQ7q617pf9Dx9nAetT+9zcMpUexbRrc9kjLw9KJgZ83zA5Dky3Vv7ZDzUjAiZ46x/cy5P0HnEnqA2A=="
|
||||
},
|
||||
"foreach": {
|
||||
"version": "2.0.5",
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
"bootstrap-material-design": "^4.1.3",
|
||||
"fastsearch": "^1.11.1",
|
||||
"fastselect": "^0.7.3",
|
||||
"flag-icon-css": "^3.3.0",
|
||||
"flag-icons": "^6.6.6",
|
||||
"jquery": "^3.5.1",
|
||||
"leaflet": "^1.4.0",
|
||||
"leaflet-easybutton": "^2.4.0",
|
||||
|
|
Ładowanie…
Reference in New Issue