Merge pull request rughh#158 from madridrb/madridrb

Madridrb label

Author: phoet

.ruby-version

@@ -1 +1 @@
-2.2.0
+2.1.1

.travis.yml

@@ -2,7 +2,7 @@ script: "CODECLIMATE_REPO_TOKEN=1c9dbc1183347accbd5a2d7ec1323ab4b0b9dea31e762940
 bundler_args: "--without development production"
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.1.1
 branches:
   only:
     - master

app/assets/images/labels/madridrb.ico

@@ -372,6 +372,25 @@ footer
     .railssupporters
       ol
         list-style: katakana
+    .sponsors
+      +phone
+        width: 90%
+      ol
+        list-style: none
+        margin-left: -3em
+        +phone
+          margin-left: 0
+      li
+        display: inline-block
+        margin-right: 1em
+        padding-bottom: 1em
+        +phone
+          padding-left: 0
+          padding-right: 0
+          margin-left: 0
+          margin-right: 0
+          display: block
+          text-align: center
 
 .ribbon_wrap
   position: absolute

app/assets/images/labels/madridrb.png

@@ -0,0 +1,5 @@
+footer section
+  .usergroups ol,
+  .railsgroups ol,
+  .railssupporters ol
+    list-style-type: square

app/assets/images/labels/madridrb/.gitkeep

@@ -2,21 +2,25 @@ class Usergroup
   DELIMITER_TIME    = ':'
   DELIMITER_DATE    = ' '
   NUMBERS           = %w(first second third fourth)
-  SUPPORTED_LOCALES = [:de, :en]
   SUPPORTED_TLDS    = [:de, :at]
 
   attr_accessor :label_id, :default_locale, :domains, :recurring, :email, :google_group, :coc
-  attr_accessor :twitter, :organizers, :location, :imprint, :other_usergroups, :tld
+  attr_accessor :twitter, :organizers, :location, :imprint, :other_usergroups, :tld, :sponsors
 
   def parse_recurring_date(date)
     number, day, _ = recurring.split(DELIMITER_DATE)
     day = Date::DAYS_INTO_WEEK[day.to_sym] + 1
-    num = NUMBERS.index(number)
-    d = date.at_beginning_of_month
-    if d.wday > day
-      d + ((num + 1) * 7 + day - d.wday).days
+    if number == 'last' then
+      d = date.at_end_of_month.change(hour: 0, minute: 0, second: 0)
+      d - ((d.wday - day) % 7).days
     else
-      d + (num * 7 + day - d.wday)
+      d = date.at_beginning_of_month
+      num = NUMBERS.index(number)
+      if d.wday > day
+        d + ((num + 1) * 7 + day - d.wday).days
+      else
+        d + (num * 7 + day - d.wday)
+      end
     end
   end
 
@@ -39,9 +43,11 @@ def next_event_date
 
   def localized_recurring
     number, day, _ = recurring.split(DELIMITER_DATE)
-    number  = NUMBERS.index(number) + 1
+
+    ordinal = I18n.t("event.#{number}")
     day     = I18n.t('date.day_names')[Date::DAYS_INTO_WEEK[day.to_sym] + 1]
-    I18n.t("event.recurring", number: number, day: day)
+
+    I18n.t("event.recurring", ordinal: ordinal, day: day)
   end
 
   def to_s
@@ -78,6 +84,7 @@ def self.from_name(name)
       it.imprint          = {address: "YourStreet 1\n0815 YourTown", contributors: [{name: "Your Name", email: "[email protected]"}]}
       it.other_usergroups = [{name: "OtherUsergroupName", url: "http://some-domain.de/", twitter: "some_handle"}]
       it.coc              = 'http://example.com'
+      it.sponsors         = []
     end
   end
 

app/assets/images/labels/madridrb/sponsors/aspgems.png

@@ -1,7 +1,9 @@
 = section_box :topics do
   p
     strong=> I18n.tw("home.like_to_talk")
-    == t("home.send_us_an_email", mail_to: mail_to(Whitelabel[:email], "E-Mail", title: "E-Mail"))
+    == t("home.send_us_an_email",
+          mail_to: mail_to(Whitelabel[:email], "E-Mail", title: "E-Mail"),
+          twitter_link: link_to_twitter(Whitelabel[:twitter]))
   = render 'users/list', users: organizers
   p== I18n.tw("home.engage")
   = button_to t("home.add_topic"), new_topic_path, method: :get

app/assets/images/labels/madridrb/sponsors/bebanjo.png

@@ -22,7 +22,10 @@ html
         = render 'shared/hint'
         = yield
     footer
-      = render 'shared/footer', imprint: Whitelabel[:imprint], other_usergroups: Whitelabel[:other_usergroups]
+      = render( 'shared/footer',
+                imprint: Whitelabel[:imprint],
+                sponsors: Whitelabel[:sponsors],
+                other_usergroups: Whitelabel[:other_usergroups] )
     = render 'peek/bar'
   = render 'shared/info'
   = javascript_include_tag :application, "//maps.googleapis.com/maps/api/js?v=3.exp&sensor=false"

app/assets/images/labels/madridrb/sponsors/codecantor.png

@@ -1,4 +1,14 @@
 section.clearfix
+  - if sponsors.present?
+    .info.clearfix.hr
+      .sponsors.block
+        h2= I18n.tw("footer.sponsored_by")
+        ol
+          - sponsors.each do |sp|
+            li
+              => link_to sp[:url], title: sp[:name] do
+                => image_tag("labels/#{Whitelabel[:label_id]}/sponsors/#{sp[:banner]}", alt: sp[:name])
+
   .info.clearfix.hr
     .contact.block
       h2= t("footer.contact")

app/assets/images/labels/madridrb/sponsors/lextrend.png

@@ -101,5 +101,9 @@ de:
       :title: Innsbruck.rb
       :subtitle: Ruby User Group Innsbruck
       :meta_desc: Ruby User Group Innsbruck
-  profile:
-    freelancer: Freelancer
+    madridrb:
+      :city: Madrid
+      :name: Madrid.rb
+      :title: Madrid.rb
+      :subtitle: Madrid Ruby User Group
+      :meta_desc: Madrid Ruby User Group

app/assets/images/labels/madridrb/sponsors/proruby.png

@@ -34,6 +34,7 @@ de:
     imprint: "Impressum"
     contact: "Kontakt"
     links: "Links"
+    sponsored_by: "Gesponsert von"
     other_usergroups: "Weitere Usergroups"
     ruby_usergroups: "Weitere Ruby Gruppen"
     ruby_supporters: "Ruby Support"
@@ -52,7 +53,7 @@ de:
   home:
     the_usergroup: "Die <strong>%{usergroup}</strong> ist eine Benutzergruppe, Anwendergruppe, Interessengemeinschaft oder auch einfach nur ein Haufen Leute, die Spaß an der Programmiersprache Ruby haben. Tausch dich mit uns aus und komm zu unserem nächsten Treffen! Neue Gesichter sind immer gerne gesehen."
     like_to_talk: "Möchtest du einen Vortrag auf der Ruby Usergroup halten oder hast du zusätzliche Themenvorschläge?"
-    send_us_an_email: "Dann schicke uns einfach eine %{mail_to} oder spreche uns persönlich an:"
+    send_us_an_email: "Dann schicke uns einfach eine %{mail_to} oder spreche uns persönlich an: %{twitter_link}"
     engage: "Usergroups leben von Vorträgen und dem Engagement der Teilnehmer. Wenn du ein Thema vermisst, oder nähre Informationen zu speziellen Bereichen suchst, dann <strong>kannst du hier gerne etwas in die Wunschliste eintragen</strong>. Solltest du schon eine Idee zu einem Vortrag oder ähnlichem haben, dann <strong>kannst du ihn hier eintragen</strong>, um Feedback von der Ruby / Rails Community zu bekommen."
     add_topic: "Eigenes Thema eintragen"
     new_topics: "Themenvorschläge"
@@ -115,8 +116,13 @@ de:
       enquiry: "%{user} würde gerne mehr zu diesem Thema erfahren"
   event:
     twitter_message: "%{name} am %{date} %{url}"
-    recurring: "jeden %{number}. %{day} im Monat"
+    recurring: "jeden %{ordinal} %{day} im Monat"
     subscribe: "meine Events abonieren"
+    first: "1."
+    second: "2."
+    third: "3."
+    fourth: "4."
+    last: "letzten"
   flash:
     duplicate_nick: "Der Nickname '%{name}' ist bereits vergeben! Wenn Du Dich schon über einen anderen Provider angemeldet hast, dann trage bitte in Deinem Profil die entsprechenden Handles ein!"
     only_admins: "Hoppala, da dürfen nur Admins hin!"

app/assets/images/labels/madridrb/sponsors/tck.png

@@ -98,3 +98,9 @@ en:
       :title: Innsbruck.rb
       :subtitle: Ruby User Group Innsbruck
       :meta_desc: Ruby User Group Innsbruck
+    madridrb:
+      :city: Madrid
+      :name: Madrid.rb
+      :title: Madrid.rb
+      :subtitle: Madrid Ruby User Group
+      :meta_desc: Madrid Ruby User Group

app/assets/stylesheets/application.sass

@@ -35,6 +35,7 @@ en:
     imprint: "Imprint"
     contact: "Contact"
     links: "Links"
+    sponsored_by: "Sponsored by"
     other_usergroups: "Other Usergroups"
     ruby_usergroups: "Other Ruby Groups"
     ruby_supporters: "Ruby Supporters"
@@ -51,14 +52,14 @@ en:
   home:
     the_usergroup: "The <strong>%{usergroup}</strong> is a usergroup, group of interest or just a bunch of people loving Ruby. Get in contact with us at our next meetup! Newbees are always welcome."
     like_to_talk: "Do you want to give a Talk at the Ruby Usergroup or do you have additional Topics to talk about?"
-    send_us_an_email: "Then send us an %{mail_to} or ping us on Twitter:"
+    send_us_an_email: "Then send us an %{mail_to} or ping us on Twitter: %{twitter_link}"
     engage: "Usergroups need engaging People. If you think some Topic is missing, or you want to have more Infos on something, <strong>you are encouraged to add it to our Wishlist</strong>. If you have an Idea for a Talk or anything else <strong>add it here</strong> to get instant Feedback of the Ruby / Rails Community."
     add_topic: "Add a Topic"
     new_topics: "Proposals"
     old_topics: "Recent Topics"
     company_workers: "A lot of the Members of the Ruby Usergroup are working there too and we love to see new faces around."
     company_missing: "If you think that a Company is missing, send us an %{email_link} or Direct-Message to %{twitter_link}"
-    next_possible_meetup_recurring: "There is no Event planned right now, the Usergroup usually meets on %{recurring}."
+    next_possible_meetup_recurring: "There is no Event planned right now, the Usergroup usually meets %{recurring}."
     next_possible_meetup: "The next Ruby / Rails Meeting is supposed to be on %{event_date}."
     next_meetup: "The next meetup"
     takes_place: "is taking place on %{event_date} at %{location_link}!"
@@ -114,8 +115,13 @@ en:
       enquiry: "%{user} would love to hear somebody talking about this topic"
   event:
     twitter_message: "%{name} at %{date} %{url}"
-    recurring: "every %{number}. %{day} a Month"
+    recurring: "every %{ordinal} %{day} of the month"
     subscribe: "subscribe my Events"
+    first: "first"
+    second: "second"
+    third: "third"
+    fourth: "fourth"
+    last: "last"
   flash:
     only_admins: "Ups, only admins allowed!"
     not_authenticated: "Ups, you are not allowed to visit this page!"

app/assets/stylesheets/labels/madridrb.sass

@@ -98,7 +98,7 @@ es:
       :title: Innsbruck.rb
       :subtitle: Ruby User Group Innsbruck
       :meta_desc: Ruby User Group Innsbruck
-    madrid-rb:
+    madridrb:
       city: Madrid
       name: Madrid.rb
       title: Madrid.rb

app/models/usergroup.rb

@@ -25,7 +25,7 @@ es:
     edit_profile: "Editar perfil"
     logout: "Salir"
     twitter_login: "Login con Twitter"
-    github_login: "Login con Githug"
+    github_login: "Login con Github"
   hint:
     close: "Cerrar"
     attention: "Atención:"
@@ -36,6 +36,7 @@ es:
     imprint: "Responsable"
     contact: "Contacto"
     links: "Enlaces"
+    sponsored_by: "Patrocinado por"
     other_usergroups: "Otros grupos de usuarios"
     ruby_usergroups: "Grupos de usuarios de ruby"
     ruby_supporters: "Grupos de apoyo a ruby"
@@ -52,15 +53,15 @@ es:
   home:
     the_usergroup: "<strong>%{usergroup}</strong> es un grupo de usuarios, grupo de interés o simplemente de personas interesadas en Ruby. Contacta con nosotros en la siguiente reunión! Todo el mundo es bienvenido, incluso si no tienes mucha experiencia con Ruby."
     like_to_talk: "Quieres dar una charla en el grupo, o quieres proponer un tema para una?"
-    send_us_an_email: "Envíanos un %{mail_to} o un tweet:"
+    send_us_an_email: "Envíanos un %{mail_to} o un tweet: %{twitter_link}"
     engage: "Los grupos de usuarios necesitan interacción. Si crees que estaría bien dar una charla sobre un Tema, o quieres profundizar sobre alguno, <strong>por favor añádelo en nuestra Wishlist</strong>. Si tienes una idea para una charla o actividad <strong>proponla aquí</strong> para obtener feedback de la comunidad de Ruby/Rails."
     add_topic: "Proponer un Tema"
     new_topics: "Propuestas"
     old_topics: "Temas recientes"
     company_workers: "En ocasiones serán lugares de trabajo de los miembros del Grupo de Usuarios; esto es normal, y les encanta ver caras nuevas."
     company_missing: "Si crees que falta una compañía, envíanos un %{email_link} o un tweet a %{twitter_link}"
     next_possible_meetup_recurring: "De momento no hay ningún evento planeado, el grupo normalmente se reúne %{recurring}."
-    next_possible_meetup: "La siguiente reunión debería tenerl lugar el %{event_date}."
+    next_possible_meetup: "La siguiente reunión debería tener lugar el %{event_date}."
     next_meetup: "La siguiente reunión"
     takes_place: "será el %{event_date} en %{location_link}!"
     takes_place_no_location: "será el %{event_date}, ¡pero <a href='%{none_url}'>todavía no tenemos sitio!</a>!"
@@ -116,8 +117,13 @@ es:
       enquiry: "%{user} propuso este tema para que otra persona hablara de él."
   event:
     twitter_message: "%{name} - %{date} %{url}"
-    recurring: "cada %{number}er %{day} del mes"
+    recurring: "el %{ordinal} %{day} del mes"
     subscribe: "Subscribirse a todos los eventos"
+    first:  "primer"
+    second: "segundo"
+    third:  "tercer"
+    fourth: "cuarto"
+    last:   "último"
   flash:
     only_admins: "Solamente los administradores pueden entrar ahí"
     not_authenticated: "Por favor autentifícate antes de entrar"