Skip to content

Commit

Permalink
Merge pull request #545 from OpenLitterMap/staging
Browse files Browse the repository at this point in the history
Merge staging
  • Loading branch information
xlcrr authored Nov 3, 2022
2 parents f2061ce + b792cc2 commit 5cc6b61
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 6 deletions.
Binary file added public/assets/dog.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=ddfb20010ea89d41990a",
"/js/app.js": "/js/app.js?id=4c494ac24958c3e7879a",
"/css/app.css": "/css/app.css?id=3a09b1f16bc62c982eba",
"/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e",
"/js/vendor.js": "/js/vendor.js?id=91b109b10d958b21d64c"
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/de/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "Plastic pollution is out of control",
"fires-out-of-control": "Zigarettenkippen können Feuer entfachen",
"glass-hurts-pets": "Zerbrochenes Glas tut Haustieren weh",
"climate-change-out-of-control": "Plastik verstärkt den Klimawandel",
"help-us": "Help us create the world's most advanced open database on litter, brands & plastic pollution",
"why-collect-data": "Why should we collect data",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/en/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "Plastic pollution is out of control",
"fires-out-of-control": "Cigarette butts can start fires",
"glass-hurts-pets": "Broken glass hurts pets",
"climate-change-out-of-control": "Plastic is increasing climate change",
"help-us": "Help us create the world's most advanced open database on litter, brands & plastic pollution",
"why-collect-data": "Why should we collect data",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/es/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "La contaminación por plásticos está fuera de control",
"fires-out-of-control": "Las colillas de cigarrillos pueden provocar incendios",
"glass-hurts-pets": "Los vidrios rotos lastiman a las mascotas",
"climate-change-out-of-control": "El plástico está aumentando el cambio climático",
"help-us": "Ayúdanos a crear la base de datos abiertos sobre basura, marcas y contaminación por plásticos más avanzada del mundo",
"why-collect-data": "¿Por qué deberíamos recolectar estos datos",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/fr/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "La pollution plastique est hors de contrôle",
"fires-out-of-control": "Les mégots de cigarette peuvent déclencher des incendies",
"glass-hurts-pets": "Le verre brisé blesse les animaux domestiques",
"climate-change-out-of-control": "La pollution plastique est en train d'aggraver le changement climatique",
"help-us": "Aidez-nous à créer la base de données sur les déchets, les marques concernées et la pollution plastique, la plus avancée au monde ",
"why-collect-data": "Pourquoi devrions-nous collecter des données",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/hu/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "A műanyagszennyezés ellenőrizhetetlen",
"fires-out-of-control": "A cigarettacsikkek tüzet okozhatnak",
"glass-hurts-pets": "A törött üveg bántja a háziállatokat",
"climate-change-out-of-control": "A műanyag fokozza a klímaváltozást",
"help-us": "Segítsen nekünk létrehozni a világ legfejlettebb nyílt adatbázisát a szemétről, a márkákról és a műanyagszennyezésről",
"why-collect-data": "Miért kell adatokat gyűjtenünk",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/nl/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "Plastic vervuiling is op hol geslagen",
"fires-out-of-control": "Sigarettenpeuken kunnen brand veroorzaken",
"glass-hurts-pets": "Dieren raken gewond door gebroken glas",
"climate-change-out-of-control": "Plastic zorgt voor toenemende klimaatverandering",
"help-us": "Help ons om de meest geavanceerde database te maken met data over afval, merken en plastic vervuiling",
"why-collect-data": "Waarom zouden we data moeten verzamelen",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/pl/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "Zanieczyszczenie plastikiem wymknęło się spod kontroli",
"fires-out-of-control": "Niedopałki papierosów mogą wywołać pożar",
"glass-hurts-pets": "Rozbite szkło boli zwierzęta",
"climate-change-out-of-control": "Plastik przyspiesza zmianę klimatu",
"help-us": "Pomóż nam stworzyć najbardziej zaawansowaną na świecie otwartą bazę danych o śmieciach, markach i zanieczyszczeniu plastikiem",
"why-collect-data": "Dlaczego powinniśmy zbierać dane",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/pt/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "A poluição de plástico está fora de controle",
"fires-out-of-control": "Bitucas de cigarros podem iniciar incêndios",
"glass-hurts-pets": "Vidro quebrado machuca animais de estimação",
"climate-change-out-of-control": "Plástico está aumentando a mudança climática",
"help-us": "Ajude-nos a criar o banco de dados aberto mais avançado do mundo sobre lixo, marcas e poluição de plástico",
"why-collect-data": "Por que devemos coletar dados",
Expand Down
1 change: 1 addition & 0 deletions resources/js/langs/sw/home/welcome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"plastic-pollution-out-of-control": "Uchafuzi wa plastiki umefikia nje ya udhibiti",
"fires-out-of-control": "Vichuni vya sigara vinaweza kuwasha moto",
"glass-hurts-pets": "Kioo kilichovunjika huumiza kipenzi",
"climate-change-out-of-control": "Plastiki inaongeza mabadiliko ya hali ya hewa",
"help-us": "Tusaidie kuunda hifadhidata ya juu zaidi duniani iliyo wazi kuhusu takataka, chapa na uchafuzi wa plastiki",
"why-collect-data": "Kwa nini tukusanye taarifa",
Expand Down
9 changes: 5 additions & 4 deletions resources/js/views/home/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
class="footer-icon"
/>
<br>

<p class="footer-text mt1">
v2.19.11
</p>
</div>

<div class="column is-2">
Expand Down Expand Up @@ -97,8 +101,7 @@
<script>
export default {
name: 'Footer',
data ()
{
data () {
return {
email: '',
socials: [
Expand All @@ -111,7 +114,6 @@ export default {
};
},
computed: {
/**
* Errors object
*/
Expand All @@ -137,7 +139,6 @@ export default {
}
},
methods: {
/**
* Clear all subscriber errors
*/
Expand Down
4 changes: 4 additions & 0 deletions resources/js/views/home/Welcome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@ export default {
title: this.$t('home.welcome.fires-out-of-control'),
img: '/assets/forest_fire.jpg'
},
{
title: this.$t('home.welcome.glass-hurts-pets'),
img: '/assets/dog.jpeg'
}
],
activeHeadingIndex: 0
};
Expand Down

0 comments on commit 5cc6b61

Please sign in to comment.