From 5cf081465ec32eeaf6b72f0fb5775da18c18cbb2 Mon Sep 17 00:00:00 2001 From: Glenn Plas Date: Thu, 26 Apr 2018 10:26:31 +0200 Subject: [PATCH 1/5] modify URL per community suggestion --- resources/europe/be/be-matrix.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/europe/be/be-matrix.json b/resources/europe/be/be-matrix.json index a00659b4d..d8a9917b1 100644 --- a/resources/europe/be/be-matrix.json +++ b/resources/europe/be/be-matrix.json @@ -7,7 +7,6 @@ "name": "OpenStreetMap BE Riot channel", "description": "All mappers are welcome! Sign up at {signupUrl}", "extendedDescription": "Multiple channels exists, for beginners to thematic channels, landuse and dev talk", - "signupUrl": "https://riot.im/app/#/register", - "url": "https://riot.im", + "url": "https://riot.im/app/#/room/#osmbe:matrix.org", "contacts": [{"name": "BE community", "email": "community@osm.be"}] } \ No newline at end of file From 3c6bf5a6f74458601eb6d571642259abcca43fa8 Mon Sep 17 00:00:00 2001 From: M1dgard Date: Thu, 26 Apr 2018 10:06:42 +0200 Subject: [PATCH 2/5] Clean Belgium strings --- resources/europe/be/be-facebook.json | 4 ++-- resources/europe/be/be-irc.json | 4 ++-- resources/europe/be/be-mailinglist.json | 4 ++-- resources/europe/be/be-matrix.json | 6 +++--- resources/europe/be/be-meetup.json | 4 ++-- resources/europe/be/be-twitter.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/europe/be/be-facebook.json b/resources/europe/be/be-facebook.json index 238734edf..1c87d328e 100644 --- a/resources/europe/be/be-facebook.json +++ b/resources/europe/be/be-facebook.json @@ -5,7 +5,7 @@ "name": "OpenStreetMap BE Community", "countryCodes": ["be"], "languageCodes": ["en", "nl", "fr", "de"], - "description": "Mappers and OpenStreetMap facebook in Belgium", + "description": "Mappers and OpenStreetMap on Facebook in Belgium", "url": "https://www.facebook.com/groups/1419016881706058/", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} \ No newline at end of file +} diff --git a/resources/europe/be/be-irc.json b/resources/europe/be/be-irc.json index 891a68e9c..996046acd 100644 --- a/resources/europe/be/be-irc.json +++ b/resources/europe/be/be-irc.json @@ -6,7 +6,7 @@ "countryCodes": ["be"], "languageCodes": ["en", "nl", "fr", "de"], "description": "Join #osmbe on irc.oftc.net (port 6667)", - "extendedDescription": "Join #osmbe on irc.oftc.net (port 6667), it is bridged with the matrix chat channel", + "extendedDescription": "Join #osmbe on irc.oftc.net (port 6667), it is bridged with the Matrix chat channel", "url": "https://webchat.oftc.net/?channels=osmbe", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} \ No newline at end of file +} diff --git a/resources/europe/be/be-mailinglist.json b/resources/europe/be/be-mailinglist.json index aaf6dd03c..2805ea208 100644 --- a/resources/europe/be/be-mailinglist.json +++ b/resources/europe/be/be-mailinglist.json @@ -5,7 +5,7 @@ "name": "Talk-be Mailing List", "countryCodes": ["be"], "languageCodes": ["en", "nl", "fr", "de"], - "description": "Talk-be is the official mailing list for Belgian OSM community", + "description": "Talk-be is the official mailing list for the Belgian OSM community", "url": "https://lists.openstreetmap.org/listinfo/talk-be", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} \ No newline at end of file +} diff --git a/resources/europe/be/be-matrix.json b/resources/europe/be/be-matrix.json index d8a9917b1..aa90a86ba 100644 --- a/resources/europe/be/be-matrix.json +++ b/resources/europe/be/be-matrix.json @@ -4,9 +4,9 @@ "type": "matrix", "countryCodes": ["be"], "languageCodes": ["en", "nl", "fr", "de"], - "name": "OpenStreetMap BE Riot channel", + "name": "OpenStreetMap BE Matrix channel", "description": "All mappers are welcome! Sign up at {signupUrl}", - "extendedDescription": "Multiple channels exists, for beginners to thematic channels, landuse and dev talk", + "extendedDescription": "Multiple channels exist: a general channel, a channel for beginners, some thematic channels…", "url": "https://riot.im/app/#/room/#osmbe:matrix.org", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} \ No newline at end of file +} diff --git a/resources/europe/be/be-meetup.json b/resources/europe/be/be-meetup.json index fd2313f56..0fb963502 100644 --- a/resources/europe/be/be-meetup.json +++ b/resources/europe/be/be-meetup.json @@ -5,9 +5,9 @@ "countryCodes": ["be"], "languageCodes": ["en", "nl", "fr", "de"], "name": "OpenStreetMap Belgium Meetup", - "description": "IRL meetups of everyone who is interested in OpenStreetMap.", + "description": "Real life meetups of everyone who is interested in OpenStreetMap", "extendedDescription": "Physical meetups are great to meet other mappers, ask them questions and to learn a lot. Especially new contributors are very welcome!", "signupUrl": "https://www.meetup.com/OpenStreetMap-Belgium/", "url": "https://meetup.com/", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} \ No newline at end of file +} diff --git a/resources/europe/be/be-twitter.json b/resources/europe/be/be-twitter.json index 16edb7203..42279e636 100644 --- a/resources/europe/be/be-twitter.json +++ b/resources/europe/be/be-twitter.json @@ -5,7 +5,7 @@ "name": "OpenStreetMap Belgium Twitter", "countryCodes": ["be"], "languageCodes": ["en", "nl", "fr", "de"], - "description": "OSM Belgium On Twitter: {url}", + "description": "OSM Belgium on Twitter: {url}", "url": "https://twitter.com/osm_be", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} \ No newline at end of file +} From a3ed30caba08dd35003c36262f0ab0a8fdc29620 Mon Sep 17 00:00:00 2001 From: Glenn Plas Date: Thu, 26 Apr 2018 11:51:19 +0200 Subject: [PATCH 3/5] npm test --- i18n/en.yaml | 14 +++++++------- resources/europe/be/be-facebook.json | 2 +- resources/europe/be/be-irc.json | 2 +- resources/europe/be/be-mailinglist.json | 2 +- resources/europe/be/be-matrix.json | 2 +- resources/europe/be/be-meetup.json | 2 +- resources/europe/be/be-twitter.json | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/i18n/en.yaml b/i18n/en.yaml index b965c328c..983c540db 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -128,28 +128,28 @@ en: description: The platform for information on OpenStreetMap in Austria be-facebook: name: OpenStreetMap BE Community - description: Mappers and OpenStreetMap facebook in Belgium + description: Mappers and OpenStreetMap on Facebook in Belgium be-forum: name: OpenStreetMap BE forum description: OpenStreetMap Belgium web forum be-irc: name: OpenStreetMap Belgium IRC description: 'Join #osmbe on irc.oftc.net (port 6667)' - extendedDescription: 'Join #osmbe on irc.oftc.net (port 6667), it is bridged with the matrix chat channel' + extendedDescription: 'Join #osmbe on irc.oftc.net (port 6667), it is bridged with the Matrix chat channel' be-mailinglist: name: Talk-be Mailing List - description: Talk-be is the official mailing list for Belgian OSM community + description: Talk-be is the official mailing list for the Belgian OSM community be-matrix: - name: OpenStreetMap BE Riot channel + name: OpenStreetMap BE Matrix channel description: 'All mappers are welcome! Sign up at {signupUrl}' - extendedDescription: 'Multiple channels exists, for beginners to thematic channels, landuse and dev talk' + extendedDescription: 'Multiple channels exist: a general channel, a channel for beginners, some thematic channels…' be-meetup: name: OpenStreetMap Belgium Meetup - description: IRL meetups of everyone who is interested in OpenStreetMap. + description: Real life meetups of everyone who is interested in OpenStreetMap extendedDescription: 'Physical meetups are great to meet other mappers, ask them questions and to learn a lot. Especially new contributors are very welcome!' be-twitter: name: OpenStreetMap Belgium Twitter - description: 'OSM Belgium On Twitter: {url}' + description: 'OSM Belgium on Twitter: {url}' byosm: name: OpenStreetMap Belarus description: OpenStreetMap Belarus telegram chat diff --git a/resources/europe/be/be-facebook.json b/resources/europe/be/be-facebook.json index 1c87d328e..a744291f9 100644 --- a/resources/europe/be/be-facebook.json +++ b/resources/europe/be/be-facebook.json @@ -8,4 +8,4 @@ "description": "Mappers and OpenStreetMap on Facebook in Belgium", "url": "https://www.facebook.com/groups/1419016881706058/", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} +} \ No newline at end of file diff --git a/resources/europe/be/be-irc.json b/resources/europe/be/be-irc.json index 996046acd..137a5fc9f 100644 --- a/resources/europe/be/be-irc.json +++ b/resources/europe/be/be-irc.json @@ -9,4 +9,4 @@ "extendedDescription": "Join #osmbe on irc.oftc.net (port 6667), it is bridged with the Matrix chat channel", "url": "https://webchat.oftc.net/?channels=osmbe", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} +} \ No newline at end of file diff --git a/resources/europe/be/be-mailinglist.json b/resources/europe/be/be-mailinglist.json index 2805ea208..c80184c39 100644 --- a/resources/europe/be/be-mailinglist.json +++ b/resources/europe/be/be-mailinglist.json @@ -8,4 +8,4 @@ "description": "Talk-be is the official mailing list for the Belgian OSM community", "url": "https://lists.openstreetmap.org/listinfo/talk-be", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} +} \ No newline at end of file diff --git a/resources/europe/be/be-matrix.json b/resources/europe/be/be-matrix.json index aa90a86ba..3b914fbd8 100644 --- a/resources/europe/be/be-matrix.json +++ b/resources/europe/be/be-matrix.json @@ -9,4 +9,4 @@ "extendedDescription": "Multiple channels exist: a general channel, a channel for beginners, some thematic channels…", "url": "https://riot.im/app/#/room/#osmbe:matrix.org", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} +} \ No newline at end of file diff --git a/resources/europe/be/be-meetup.json b/resources/europe/be/be-meetup.json index 0fb963502..329fe7274 100644 --- a/resources/europe/be/be-meetup.json +++ b/resources/europe/be/be-meetup.json @@ -10,4 +10,4 @@ "signupUrl": "https://www.meetup.com/OpenStreetMap-Belgium/", "url": "https://meetup.com/", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} +} \ No newline at end of file diff --git a/resources/europe/be/be-twitter.json b/resources/europe/be/be-twitter.json index 42279e636..69ee72a81 100644 --- a/resources/europe/be/be-twitter.json +++ b/resources/europe/be/be-twitter.json @@ -8,4 +8,4 @@ "description": "OSM Belgium on Twitter: {url}", "url": "https://twitter.com/osm_be", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} +} \ No newline at end of file From 5739d6bba6910fe65418b4b5e6d87a00982635d2 Mon Sep 17 00:00:00 2001 From: Glenn Plas Date: Thu, 26 Apr 2018 11:52:39 +0200 Subject: [PATCH 4/5] remove signup link per jbelien suggestion --- resources/europe/be/be-matrix.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/europe/be/be-matrix.json b/resources/europe/be/be-matrix.json index 3b914fbd8..4c690d0f7 100644 --- a/resources/europe/be/be-matrix.json +++ b/resources/europe/be/be-matrix.json @@ -5,8 +5,8 @@ "countryCodes": ["be"], "languageCodes": ["en", "nl", "fr", "de"], "name": "OpenStreetMap BE Matrix channel", - "description": "All mappers are welcome! Sign up at {signupUrl}", + "description": "All mappers are welcome!", "extendedDescription": "Multiple channels exist: a general channel, a channel for beginners, some thematic channels…", "url": "https://riot.im/app/#/room/#osmbe:matrix.org", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} \ No newline at end of file +} From 42350dbc2f713255929fc04a4b026e60259531fc Mon Sep 17 00:00:00 2001 From: Glenn Plas Date: Thu, 26 Apr 2018 11:53:00 +0200 Subject: [PATCH 5/5] npm test --- i18n/en.yaml | 2 +- resources/europe/be/be-matrix.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/en.yaml b/i18n/en.yaml index 983c540db..d0a859db3 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -141,7 +141,7 @@ en: description: Talk-be is the official mailing list for the Belgian OSM community be-matrix: name: OpenStreetMap BE Matrix channel - description: 'All mappers are welcome! Sign up at {signupUrl}' + description: All mappers are welcome! extendedDescription: 'Multiple channels exist: a general channel, a channel for beginners, some thematic channels…' be-meetup: name: OpenStreetMap Belgium Meetup diff --git a/resources/europe/be/be-matrix.json b/resources/europe/be/be-matrix.json index 4c690d0f7..0fdf606a8 100644 --- a/resources/europe/be/be-matrix.json +++ b/resources/europe/be/be-matrix.json @@ -9,4 +9,4 @@ "extendedDescription": "Multiple channels exist: a general channel, a channel for beginners, some thematic channels…", "url": "https://riot.im/app/#/room/#osmbe:matrix.org", "contacts": [{"name": "BE community", "email": "community@osm.be"}] -} +} \ No newline at end of file