Skip to content
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

Jump to bottom

Enables history view for countryPanel #4220

Merged
merged 10 commits into from
Jun 8, 2022
Merged

Enables history view for countryPanel #4220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b0f281b
[historical view] Enable country panel for other time aggregates part…
Jun 3, 2022
b44569c
[historical view] Enable country panel for other time aggregates part…
Jun 3, 2022
6ff24be
[historical-view] Enable country panel for other time aggregates part…
Jun 3, 2022
2e3c2aa
[historical view] Enable country panel for other time aggregates part…
Jun 3, 2022
c06adca
Fix some bugs (#4224)
Jun 5, 2022
ba372c7
Address comments
Jun 8, 2022
9849a29
add loading
Jun 8, 2022
271c56e
Merge branch 'master' into temp_main
Jun 8, 2022
da33ee7
setting to null is not ideal
Jun 8, 2022
01f64a8
Merge branch 'temp_main' of github.com:electricitymap/electricitymap-…
Jun 8, 2022
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
437 changes: 103 additions & 334 deletions web/public/locales/ar.json
View file
Open in desktop

Large diffs are not rendered by default.

1,599 changes: 372 additions & 1,227 deletions web/public/locales/cs.json
View file
Open in desktop

Large diffs are not rendered by default.

237 changes: 60 additions & 177 deletions web/public/locales/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"now": "Nu"
},
"country-history": {
"carbonintensity24h": "CO₂-intensitet i de sidste 24 timer",
"emissionsorigin24h": "CO₂-udledningens oprindelse i de sidste 24 timer",
"emissionsproduction24h": "CO₂ udledt i de sidste 24 timer",
"electricityorigin24h": "Elektricitetens oprindelse i de sidste 24 timer",
"electricityproduction24h": "Elproduktionen i de sidste 24 timer",
"electricityprices24h": "Elprisen i de sidste 24 timer"
"carbonintensity": { "hourly": "CO₂-intensitet i de sidste 24 timer" },
"emissionsorigin": { "hourly": "CO₂-udledningens oprindelse i de sidste 24 timer" },
"emissionsproduction": { "hourly": "CO₂ udledt i de sidste 24 timer" },
"electricityorigin": { "hourly": "Elektricitetens oprindelse i de sidste 24 timer" },
"electricityproduction": { "hourly": "Elproduktionen i de sidste 24 timer" },
"electricityprices": { "hourly": "Elprisen i de sidste 24 timer" }
},
"footer": {
"foundbugs": "Har du fundet fejl eller har du ideer? Skriv",
Expand Down Expand Up @@ -78,11 +78,7 @@
"newversion": "En ny version er tilgængelig! Tryk <a onClick=\"location.reload(true);\">her</a> for at opdatere.",
"retrynow": "Prøv igen nu"
},
"mobile-main-menu": {
"map": "electricityMap",
"areas": "Regioner",
"about": "Om kortet"
},
"mobile-main-menu": { "map": "electricityMap", "areas": "Regioner", "about": "Om kortet" },
"wind": "Vind",
"solar": "Sol",
"hydro": "Hydro",
Expand All @@ -105,171 +101,58 @@
"emissionsImportedFrom": "<b>%1$s %%</b> af CO₂-udledninger i <img id=\"country-flag\"></img> <b>%2$s</b> importeres fra <img id=\"country-exchange-flag\"></img> <b>%3$s</b>",
"ofCO2eqPerMinute": "af CO₂-ækvivalenter per minut",
"zoneShortName": {
"AL": {
"zoneName": "Albanien"
},
"AT": {
"zoneName": "Østrig"
},
"AX": {
"zoneName": "Åland"
},
"BA": {
"zoneName": "Bosnien-Hercegovina"
},
"BE": {
"zoneName": "Belgien"
},
"BG": {
"zoneName": "Bulgarien"
},
"BY": {
"zoneName": "Belarus"
},
"CH": {
"zoneName": "Schweiz"
},
"CZ": {
"zoneName": "Tjekkiet"
},
"DE": {
"zoneName": "Tyskland"
},
"DK": {
"zoneName": "Danmark"
},
"DK-DK1": {
"countryName": "Danmark",
"zoneName": "Vestdanmark"
},
"DK-DK2": {
"countryName": "Danmark",
"zoneName": "Østdanmark"
},
"EE": {
"zoneName": "Estland"
},
"ES": {
"zoneName": "Spanien"
},
"FI": {
"zoneName": "Finland"
},
"FR": {
"zoneName": "Frankrig"
},
"GB": {
"zoneName": "Storbritannien"
},
"GB-NIR": {
"zoneName": "Nordirland"
},
"GR": {
"zoneName": "Grækenland"
},
"HR": {
"zoneName": "Kroatien"
},
"HU": {
"zoneName": "Ungarn"
},
"IE": {
"zoneName": "Irland"
},
"IS": {
"zoneName": "Island"
},
"IT": {
"zoneName": "Italien"
},
"LT": {
"zoneName": "Litauen"
},
"LU": {
"zoneName": "Luxemburg"
},
"LV": {
"zoneName": "Letland"
},
"MD": {
"zoneName": "Moldavien"
},
"ME": {
"zoneName": "Montenegro"
},
"MK": {
"zoneName": "Nordmakedonien"
},
"MT": {
"zoneName": "Malta"
},
"NL": {
"zoneName": "Holland"
},
"NO": {
"zoneName": "Norge"
},
"NO-NO1": {
"countryName": "Norge",
"zoneName": "Sydøstnorge"
},
"NO-NO2": {
"countryName": "Norge",
"zoneName": "Sydvestnorge"
},
"NO-NO3": {
"countryName": "Norge",
"zoneName": "Midtnorge"
},
"NO-NO4": {
"countryName": "Norge",
"zoneName": "Nordnorge"
},
"NO-NO5": {
"countryName": "Norge",
"zoneName": "Vestnorge"
},
"PE": {
"zoneName": "Peru"
},
"PL": {
"zoneName": "Polen"
},
"PT": {
"zoneName": "Portugal"
},
"RO": {
"zoneName": "Rumænien"
},
"RS": {
"zoneName": "Serbien"
},
"RU": {
"zoneName": "Rusland"
},
"SE": {
"zoneName": "Sverige"
},
"SG": {
"zoneName": "Singapore"
},
"SI": {
"zoneName": "Slovenien"
},
"SK": {
"zoneName": "Slovakiet"
},
"TR": {
"zoneName": "Tyrkiet"
},
"TW": {
"zoneName": "Taiwan"
},
"UA": {
"zoneName": "Ukraine"
},
"UY": {
"zoneName": "Uruguay"
}
"AL": { "zoneName": "Albanien" },
"AT": { "zoneName": "Østrig" },
"AX": { "zoneName": "Åland" },
"BA": { "zoneName": "Bosnien-Hercegovina" },
"BE": { "zoneName": "Belgien" },
"BG": { "zoneName": "Bulgarien" },
"BY": { "zoneName": "Belarus" },
"CH": { "zoneName": "Schweiz" },
"CZ": { "zoneName": "Tjekkiet" },
"DE": { "zoneName": "Tyskland" },
"DK": { "zoneName": "Danmark" },
"DK-DK1": { "countryName": "Danmark", "zoneName": "Vestdanmark" },
"DK-DK2": { "countryName": "Danmark", "zoneName": "Østdanmark" },
"EE": { "zoneName": "Estland" },
"ES": { "zoneName": "Spanien" },
"FI": { "zoneName": "Finland" },
"FR": { "zoneName": "Frankrig" },
"GB": { "zoneName": "Storbritannien" },
"GB-NIR": { "zoneName": "Nordirland" },
"GR": { "zoneName": "Grækenland" },
"HR": { "zoneName": "Kroatien" },
"HU": { "zoneName": "Ungarn" },
"IE": { "zoneName": "Irland" },
"IS": { "zoneName": "Island" },
"IT": { "zoneName": "Italien" },
"LT": { "zoneName": "Litauen" },
"LU": { "zoneName": "Luxemburg" },
"LV": { "zoneName": "Letland" },
"MD": { "zoneName": "Moldavien" },
"ME": { "zoneName": "Montenegro" },
"MK": { "zoneName": "Nordmakedonien" },
"MT": { "zoneName": "Malta" },
"NL": { "zoneName": "Holland" },
"NO": { "zoneName": "Norge" },
"NO-NO1": { "countryName": "Norge", "zoneName": "Sydøstnorge" },
"NO-NO2": { "countryName": "Norge", "zoneName": "Sydvestnorge" },
"NO-NO3": { "countryName": "Norge", "zoneName": "Midtnorge" },
"NO-NO4": { "countryName": "Norge", "zoneName": "Nordnorge" },
"NO-NO5": { "countryName": "Norge", "zoneName": "Vestnorge" },
"PE": { "zoneName": "Peru" },
"PL": { "zoneName": "Polen" },
"PT": { "zoneName": "Portugal" },
"RO": { "zoneName": "Rumænien" },
"RS": { "zoneName": "Serbien" },
"RU": { "zoneName": "Rusland" },
"SE": { "zoneName": "Sverige" },
"SG": { "zoneName": "Singapore" },
"SI": { "zoneName": "Slovenien" },
"SK": { "zoneName": "Slovakiet" },
"TR": { "zoneName": "Tyrkiet" },
"TW": { "zoneName": "Taiwan" },
"UA": { "zoneName": "Ukraine" },
"UY": { "zoneName": "Uruguay" }
}
}
Loading