update codes of conduct

Gemfile.lock

@@ -40,7 +40,7 @@ GEM
       uber (~> 0.0.4)
     http_parser.rb (0.5.3)
     i18n (0.6.11)
-    json (1.8.1)
+    json (1.8.3)
     kramdown (1.4.1)
     listen (2.7.9)
       celluloid (>= 0.15.2)
@@ -133,3 +133,6 @@ DEPENDENCIES
   middleman-deploy
   middleman-livereload
   wdm (~> 0.1.0)
+
+BUNDLED WITH
+   1.11.2

config.rb

@@ -16,7 +16,7 @@ def t(id, replacements = {})
 set :js_dir, 'javascripts'
 set :images_dir, 'images'
 
-set :displayed_languages, %i(en de es pl fr)
+set :displayed_languages, %i(en de es pl fr it)
 
 configure :build do
   activate :minify_css

data/supporters.json

@@ -430,16 +430,16 @@
       ]
     },
     {
-      "name": "Wizard Amigos Institute",
+      "name": "Wizard Amigos",
       "city": "Berlin",
       "country": "Germany",
-      "link": "http://wizard.amigos.institute",
+      "link": "http://wizardamigos.com",
       "twitter": "wizardamigos",
       "contacts": [
         {
-          "name": "Wizard Amigo",
+          "name": "Wizard Amigos",
           "twitter": "wizardamigos",
-          "email": "[email protected]"
+          "email": "[email protected]"
         },
         {
           "name": "Alexander Praetorius",
@@ -739,6 +739,284 @@
           "twitter": "hamoid"
         }
       ]
+    },
+    {
+      "name": "Berlin Node.js Community Meetup",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "https://ti.to/travisci/berlin-node-js-community-meetup",
+      "contacts": [
+        {
+          "name": "Jenifer Duke",
+          "email": "[email protected]",
+          "phone": "+49 170 7986487"
+        },
+        {
+          "name": "Vanja Cosic",
+          "email": "[email protected]",
+          "phone": "+45 28 49 16 32"
+        }
+      ]
+    },
+    {
+      "name": "Berlin.JS – Berlin JavaScript usergroup",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://www.berlinjs.org",
+      "twitter": "berlinjs",
+      "contacts": [
+        {
+          "name":    "Michele Guido",
+          "twitter": "sheley"
+        },
+        {
+          "name": "Robin Mehner",
+          "twitter": "rmehner",
+          "phone": "+49 160 906 59729",
+          "email": "[email protected]"
+        }
+      ]
+    },
+    {
+      "name": "Macoun - Mac OS X and iOS Developer Conference",
+      "city": "Frankfurt",
+      "country": "Germany",
+      "link": "https://macoun.de",
+      "twitter": "MacounFFM",
+      "contacts": [
+        {
+          "name": "Christian Hauser",
+          "phone": "+49 69 981 912 06",
+          "email": "[email protected]"
+        },
+        {
+          "name": "Thomas Biedorf",
+          "phone": "+49 69 981 912 06",
+          "email": "[email protected]"
+        }
+      ]
+    },
+    {
+      "name": "Rustfest",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://rustfest.eu",
+      "twitter": "rustfest",
+      "contacts": [
+        {
+          "name": "Florian Gilcher",
+          "phone": "+49 172 8122469",
+          "email": "[email protected]"
+        }
+      ]
+    },
+    {
+        "name": "React.HH",
+        "city": "Hamburg",
+        "country": "Germany",
+        "link": "http://www.meetup.com/de-DE/Hamburg-React-js-Meetup/",
+        "twitter": "reacthh",
+        "contacts": [
+          {
+            "name": "Dave Brotherstone",
+            "phone": "+49 177 5548569",
+            "email": "[email protected]",
+            "twitter": "bruderstein"
+          },
+          {
+            "name": "Rebecca Spindler",
+            "phone": "+49 170 9322635",
+            "email": "[email protected]",
+            "twitter": "beccspin"
+          },
+          {
+            "name": "Leonard Koch",
+            "email": "[email protected]",
+            "twitter": "LeonardKoch_"
+          }
+        ]
+    },
+    {
+        "name": "node.HH",
+        "city": "Hamburg",
+        "country": "Germany",
+        "link": "http://www.meetup.com/de-DE/node-HH/",
+        "twitter": "NodeHamburg",
+        "contacts": [
+          {
+            "name": "Gregor Elke",
+            "phone": "+49 174 2100996",
+            "email": "[email protected]",
+            "twitter": "greelgorke"
+          }
+        ]
+    },
+    {
+      "name": "decode hamburg",
+      "city": "Hamburg",
+      "country": "Germany",
+      "link": "https://www.meetup.com/decode-hh/",
+      "twitter": "decodehh",
+      "contacts": [
+        {
+          "name": "Martin Schuhfuss",
+          "phone": "+49 172 5188 662",
+          "email": "[email protected]",
+          "twitter": "usefulthink"
+        },
+        {
+          "name": "Felicitas Kugland",
+          "email": "[email protected]",
+          "twitter": "kotzendekrabbe"
+        }
+      ]
+    },
+    {
+      "name": "HH.JS",
+      "city": "Hamburg",
+      "country": "Germany",
+      "link": "http://www.meetup.com/hamburg-js/",
+      "twitter": "hhjs",
+      "contacts": [
+        {
+          "name": "Martin Kleppe",
+          "phone": "+49 178 236 53 40",
+          "email": "[email protected]",
+          "twitter": "aemkei"
+        },
+        {
+          "name": "Felicitas Kugland",
+          "email": "[email protected]",
+          "twitter": "kotzendekrabbe"
+        },
+        {
+          "name": "Rebecca Spindler",
+          "phone": "+49 170 9322635",
+          "email": "[email protected]",
+          "twitter": "beccspin"
+        },
+        {
+          "name": "Daniel Dembach",
+          "phone": "+49 151 22962186",
+          "email": "[email protected]",
+          "twitter": "dmbch"
+        }
+      ]
+    },
+    {
+      "name": "CouchDB Meetup Hamburg",
+      "city": "Hamburg",
+      "country": "Germany",
+      "link": "http://www.meetup.com/CouchDB-Meetup-Hamburg/",
+      "twitter": "HamburgCouchDB",
+      "contacts": [
+        {
+          "name": "Klaus Trainer",
+          "phone": "+49 1577 7855886",
+          "email": "[email protected]",
+          "twitter": "KlausTrainer"
+        }
+      ]
+    },
+    {
+      "name": "DO!Hack 2016",
+      "city": "Dortmund",
+      "country": "Germany",
+      "link": "https://www.dohack.io",
+      "twitter": "dohack_io",
+      "contacts": [
+        {
+          "name":    "Christoph Weinzierl",
+          "email":   "[email protected]",
+          "twitter": "wir3bug"
+        }
+      ]
+    },
+    {
+      "name": "Berlin C++ User Group",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://www.meetup.com/berlincplusplus/",
+      "contacts": [
+        {
+          "name":    "Fabio Fracassi",
+          "phone":   "+49 172 97 28 955",
+          "email":   "[email protected]"
+        },
+        {
+          "name": "Celine Dedaj",
+          "email": "[email protected]"
+        }
+      ]
+    },
+    {
+      "name": "Coding Amigos - collective of freelance developers",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://codingamigos.com",
+      "twitter": "codingamigos",
+      "contacts": [
+        {
+          "name": "Coding Amigos",
+          "twitter": "codingamigos",
+          "email": "[email protected]"
+        },
+        {
+          "name": "Nina Breznik",
+          "twitter": "ninabreznik",
+          "email": "[email protected]"
+        },
+        {
+          "name": "Alexander Praetorius",
+          "twitter": "serapath",
+          "email": "[email protected]"
+        }
+      ]
+    },
+    {
+      "name": "Refugees Work",
+      "city": "Berlin",
+      "country": "Germany",
+      "link": "http://refugeeswork.com",
+      "twitter": "refugeeswork",
+      "contacts": [
+        {
+          "name": "RefugeesWork",
+          "twitter": "refugeeswork",
+          "email": "[email protected]"
+        }
+      ]
+    },
+    {
+      "name": "Serverless Usergroup Hamburg",
+      "city": "Hamburg",
+      "country": "Germany",
+      "link": "http://www.meetup.com/Serverless-Hamburg",
+      "contacts": [
+        {
+          "name": "Soenke Ruempler",
+          "twitter": "s0enke",
+          "email": "[email protected]"
+        }
+      ]
+    },
+    {
+      "name": "Hamburg AngularJS Meetup",
+      "city": "Hamburg",
+      "country": "Germany",
+      "link": "http://www.meetup.com/Hamburg-AngularJS-Meetup/",
+      "twitter": "angular_hamburg",
+      "contacts": [
+        {
+          "name": "David Muellerchen",
+          "email": "[email protected]",
+          "twitter": "webdave_de"
+        },
+        {
+          "name": "John Behrens",
+          "twitter": "WebConsultsEu"
+        }
+      ]
     }
   ]
 }

locales/it.yml

@@ -0,0 +1,12 @@
+---
+it:
+  header:
+    title: "Berlin Code of Conduct"
+    sub-title: "Un Codice di Condotta per tutti gli user group e le conferenze"
+  supporters:
+    title: "Aderenti"
+    sub-title: "Gli user group e le conferenze che supportano il Berlin Code of Conduct"
+    add: "Se vuoi aggiungere alla lista il tuo user group o la tua conferenza, semplicemente crea una pull request su %{link:our repository}."
+  footer:
+    attribution: "Questo Codice di Condotta è adattato dal %{link:pdx.rb code of conduct}."
+

source/localizable/_code-of-conduct.en.md

@@ -35,6 +35,8 @@ Unacceptable behaviors include: intimidating, harassing, abusive, discriminatory
 
 Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention.
 
+Critical examination of beliefs, including critical commentary on another person’s views, does not, by itself, constitute hostile conduct or harassment. One of the underlying rationales of this Code of Conduct is to promote the free exchange of ideas, not to inhibit it.
+
 
 Consequences of Unacceptable Behavior
 -------------------------------------

source/localizable/_code-of-conduct.es.md

@@ -36,6 +36,8 @@ Comportamientos inaceptables incluyen: discursos o acciones intimidantes, acosad
 
 Acoso incluye: daño o perjurio verbal o escrito relacionado con género, orientación sexual, raza, religión, incapacidad; uso inapropiado de imágenes de desnudez en espacios públicos (incluyendo presentaciones digitales); intimidación deliberada, acecho o persecución; fotografías o grabaciones abusivas; interrupción sostenida de presentaciones u de otros eventos; contacto físico inapropiado y atención sexual no deseada.
 
+El análisis crítico de las opiniones, incuyendo el comentario crítico de las opiniones de las otras personas, no se puede considerar como una conducta hostil o un hostigamiento. Uno de los fundamentos de este Código de Conducta es promover el libre intercambio de ideas, y no inhibir dichos intercambios.
+
 
 Consecuencias del comportamiento inaceptable
 --------------------------------------------

source/localizable/_code-of-conduct.fr.md

@@ -35,6 +35,8 @@ Sont considérés comme inacceptables : l'intimidation, le harcèlement, la mal
 
 Sont considérés comme du harcèlement : les commentaires blessants ou malveillants (écrits ou verbaux) sur le genre, l'orientation sexuelle, la race, la religion, le handicap ; l'usage inapproprié de la nudité et/ou d'images à connotation sexuelle dans un espace public (y compris des diaporamas de présentations) ; l'intimidation volontaire ; la traque ou harcèlement par les faits (*stalking*) ; le harcèlement photo ou vidéo ; l'interruption ou la perturbation volontaire de présentations ou d'autres événements ; le contact physique inapproprié ou les attentions sexuelles non désirées.
 
+L'examen critique des opinions, passant notamment par des commentaires critiques des points de vue d'une autre personne, ne constitue pas en soi une attitude hostile ni quelconque harcèlement. Une des raisons sous-jacentes de ce code de conduite est de promouvoir le libre échange d'idées et non de l'inhiber.
+
 
 Conséquences d'un comportement inacceptable
 -------------------------------------