Merge branch 'master' of github.com:diaspora/diaspora

app/views/layouts/application.html.haml

@@ -57,6 +57,17 @@
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
         })();
 
+    -if APP_CONFIG[:piwik_id]
+      :javascript
+        var pkBaseURL = (("https:" == document.location.protocol) ? "https://#{APP_CONFIG[:piwik_url]}/" : "http://#{APP_CONFIG[:piwik_url]}/");
+        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+        try {
+        var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", #{APP_CONFIG[:piwik_id]});
+        piwikTracker.trackPageView();
+        piwikTracker.enableLinkTracking();
+        } catch( err ) {}
+
+
     - if current_user
       %link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"}
 

config/app_config.yml.example

@@ -68,6 +68,12 @@ default:
 
   #google analytics key, if false, it won't include the javascript
   google_a_site: false
+  
+  #piwik integration if not set, no javascript included
+  piwik_id: 
+  # the site url in raw format (e.g. pikwik.examplehost.com)
+  piwik_url: 
+  
 
   #cloudfiles username and api-key, used for backups
   cloudfiles_username: 'example'

config/languages.yml

@@ -8,6 +8,7 @@ available:
   en: 'English'
   es: 'Español'
   es-CL: 'Español Chileno'
+  fi: 'Suomi'
   fr: 'Français'
   he: 'עברית'
   id: 'Bahasa Indonesia'

config/locales/devise/devise.fi.yml

@@ -8,7 +8,7 @@ fi:
     confirmations: 
       confirmed: "Käyttäjätilisi luonti on vahvistettu. Olet nyt kirjautunut sisään."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
+        resend_confirmation: "Lähetä vahvistusohjeet uudelleen"
       send_instructions: "Saat hetken päästä sähköpostiisi ohjeet siitä miten vahvistat käyttäjätilisi luonnin."
     failure: 
       inactive: "Käyttätiliäsi ei ole vielä vahvistettu."
@@ -19,35 +19,35 @@ fi:
       unauthenticated: "Kirjaudu tai rekisteröidy ennen kuin voit jatkaa."
       unconfirmed: "Sinun täytyy vahvistaa käyttäjätilisi ennen kuin voit jatkaa"
     invitations: 
-      invitation_token_invalid: "The invitation token provided is not valid!"
+      invitation_token_invalid: "Kutsun vahvistustunnus on virheellinen!"
       send_instructions: "Kutsusi on lähetetty."
-      updated: "Your password was set successfully. You are now signed in."
+      updated: "Salasanasi on tallennettu. Olet kirjautunut sisään."
     mailer: 
       confirmation_instructions: 
-        confirm: "Confirm my account"
-        subject: "Confirmation instructions"
-        you_can_confirm: "You can confirm your account through the link below:"
+        confirm: "Vahvista käyttäjätilini"
+        subject: "Vahvistamisohjeet"
+        you_can_confirm: "Voit vahvistaa käyttäjätilisi alla olevan linkin kautta:"
       hello: "Hei %{email}!"
       invitation: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
+        accept: "Hyväksy kutsu"
+        ignore: "Jos et halua hyväksyä kutsua, voit jättää tämän viestin huomioimatta."
+        no_account_till: "Käyttäjätilisi luodaan vasta kun rekisteröidyt ylläolevan linkin kautta. "
         subject: "Sinut on kutsuttu käyttämään Diasporaa!"
       inviters: 
-        accept_at: ", at %{url}, you can accept it through the link below."
+        accept_at: ", osoitteessa %{url}, voit hyväksyä sen alla olevasta linkistä."
         has_invited_you: "%{name} on kutsunut sinut liittymään Diasporaan"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        have_invited_you: "%{names} ovat kutsuneet sinut Diasporan käyttäjäksi"
       reset_password_instructions: 
         change: "Vaihda salasana"
-        ignore: "If you didn't request this, please ignore this email."
-        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
-        subject: "Reset password instructions"
+        ignore: "Jos et pyytänyt tätä, voit jättää viestin huomiotta."
+        someone_requested: "Joku on pyytänyt salasanasi vaihtamista. Voit tehdä sen allaolevan linkin kautta. "
+        subject: "Palauta salasanan ohjeet"
         wont_change: "Your password won't change until you access the link above and create a new one."
       unlock_instructions: 
-        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
-        click_to_unlock: "Click the link below to unlock your account:"
-        subject: "Unlock Instructions"
-        unlock: "Unlock my account"
+        account_locked: "Käyttäjätilisi on lukittu liian usean epäonnistuneen kirjautumisyrityksen vuoksi."
+        click_to_unlock: "Avaa käyttäjätilisi alla olevasta linkistä:"
+        subject: "Avaamisohjeet"
+        unlock: "Avaa käyttäjätilini"
       welcome: "Tervetuloa %{email}!"
     passwords: 
       edit: 
@@ -63,11 +63,11 @@ fi:
       updated: "Käyttäjätilisi on päivitetty."
     sessions: 
       new: 
-        alpha_software: "You are about to use alpha software."
-        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        alpha_software: "Sovellus on alpha versio. "
+        bugs_and_feedback: "Ota huomioon, että tulet kohtaamaan ohjelmistovirheitä. Kannustamme sinua ilmoittamaan kaikki kokemasi virheet oikealla puolella olevan Feedback nappulan kautta! Korjaamme ilmoittamasi virheet mahdollisimman nopeasti. "
         have_a_problem: "Ongelmia? Löydä ratkaisu täältä"
         login: "Kirjautuminen"
-        modern_browsers: "only supports modern browsers."
+        modern_browsers: "tukee vain moderneja selaimia."
         password: "Salasana"
         remember_me: "Muista minut"
         sign_in: "Kirjaudu"
@@ -77,16 +77,16 @@ fi:
     shared: 
       links: 
         forgot_your_password: "Unohditko salasanasi?"
-        receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_confirmation: "Etkö saanut vahvistusohjeita?"
+        receive_unlock: "Etkö saanut avaamisohjeita?"
         sign_in: "Kirjaudu"
         sign_up: "Rekisteröidy"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "Avoin rekisteröityminen on tällä hetkellä suljettu. "
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Rekisteröidy saadaksesi kutsu!"
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
+        resend_unlock: "Lähetä avaamisohjeet uudelleen"
       send_instructions: "Saat muutaman minuutin kuluttua sähköpostiisi ohjeet siitä miten avaat lukituksen."
       unlocked: "Käyttäjätilisi lukitus on avattu. Olet nyt kirjautunut sisään."
   errors: 

config/locales/devise/devise.it.yml

@@ -83,7 +83,7 @@ it:
         sign_up: "Registrati"
         sign_up_closed: "Le iscrizioni pubbliche sono chiuse al momento."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Registrati per ricevere un invito!"
     unlocks: 
       new: 
         resend_unlock: "Invia di nuovo le istruzioni per lo sblocco"

config/locales/devise/devise.ru.yml

@@ -83,7 +83,7 @@ ru:
         sign_up: "Регистрация"
         sign_up_closed: "Регистрация на данный момент не доступна."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Зарегистрируйтесь для приглашения!"
     unlocks: 
       new: 
         resend_unlock: "Отправить повторно инструкции по разблокированию"

config/locales/diaspora/it.yml

@@ -41,9 +41,9 @@ it:
     destroy: 
       success: "%{name} è stato rimosso con successo."
     edit_aspect_pane: 
-      add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      add_existing: "Aggiungi un contatto esistente"
+      confirm_remove_aspect: "Rimuovere l'aspetto?"
+      remove_aspect: "Rimuovi Aspetto"
     helper: 
       are_you_sure: "Sei sicuro di voler cancellare questo aspetto?"
       aspect_not_empty: "Aspetto non vuoto"
@@ -89,10 +89,10 @@ it:
       comment: "Commento"
       commenting: "Invio commento in corso..."
   contacts: 
-    few: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
-    zero: "no contacts"
+    few: "%{count} contatti"
+    one: "1 contatto"
+    other: "%{count} contatti"
+    zero: "nessun contatto"
   delete: "Cancella"
   email: "Email"
   error_messages: 
@@ -142,10 +142,10 @@ it:
       logout: "esci"
       view_profile: "visualizza profilo"
   new_requests: 
-    few: "%{count} new requests!"
-    one: "new request!"
-    other: "%{count} new requests!"
-    zero: "no new requests"
+    few: "%{count} nuove richieste!"
+    one: "nuova richiesta!"
+    other: "%{count} nuove richieste!"
+    zero: "nessuna nuova richiesta"
   notifier: 
     diaspora: "l'email robot di diaspora"
     hello: "Ciao %{name}!"
@@ -162,8 +162,8 @@ it:
   ok: "OK"
   or: "o"
   pagination: 
-    next: "Next"
-    previous: "Previous"
+    next: "Successivo"
+    previous: "Precedente"
   password: "Password"
   password_confirmation: "Conferma password"
   people: 
@@ -297,19 +297,19 @@ it:
       all_contacts: "Tutti i contatti"
       aspect_settings: "Impostazioni aspetto"
       aspects: "Aspetti"
-      confirm_remove_aspect: "Rimuovere aspetto?"
+      confirm_remove_aspect: "Rimuovere l'aspetto?"
       done_editing: "modifica completata"
       invites: "Inviti"
       no_contacts: "Al momento non hai contatti.  Trova i tuoi contatti qui."
       remove_aspect: "Rimuovi Aspetto"
     contact_list: 
-      all_contacts: "All contacts"
+      all_contacts: "Tutti i contatti"
       cannot_remove: "Impossibile rimuovere la persona dall'ultimo aspetto."
     invitations: 
       dont_have_now: "Non ne hai alcuno per il momento, ma altri arriveranno presto!"
       invitations_left: "(%{count} rimanenti)"
       invite_someone: "Invita qualcuno"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "Al momento gli inviti sono chiusi su questo pod Diaspora."
     notification: 
       new: "Nuovo %{type} da %{from}"
     public_explain: 
@@ -338,8 +338,8 @@ it:
     show: 
       destroy: "Distruggi"
   stream_helper: 
-    hide_comments: "hide comments"
-    show_comments: "show comments"
+    hide_comments: "nascondi i commenti"
+    show_comments: "mostra i commenti"
   the_world: "il mondo"
   username: "Username"
   users: 
@@ -366,10 +366,10 @@ it:
         add: "Aggiungi"
         aspect_name: "Nome aspetto"
         description: "Specifica a Diaspora quali dei tuoi diversi aspetti sono visti da persone diverse. Potrai gestirli in un secondo momento attraverso il menu account in alto a destra. I tuoi aspetti sono visibili solo da te e non dagli altri."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
+        drag_to_add: "Trascinale sull'aspetto di te che conoscono"
+        no_requests: "Non hai richieste"
         your_aspects: "I tuoi aspetti"
-        your_inviter: "Here are the people who are waiting for you:"
+        your_inviter: "Queste sono le persone che ti stanno aspettando:"
       step_3: 
         description: "Puoi collegare altri social network a cui sei iscritto al tuo account Diaspora. Potrai postarci pubblicamente della tua Home page quando selezioni \"rendilo pubblico\""
         your_services: "I tuoi servizi"
@@ -390,8 +390,8 @@ it:
       password_changed: "Password Cambiata"
       password_not_changed: "Cambio di password fallito"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
-    hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
-    no_person_constructed: "No person could be constructed from this hcard."
-    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
-    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+    fetch_failed: "impossibile recuperare il profilo webfinger da %{profile_url}"
+    hcard_fetch_failed: "impossibile recuperare l'hcard di %{account}"
+    no_person_constructed: "Questa hcard non contiene i dati di una persona."
+    not_enabled: "webfinger non attivo sull'host di %{account}"
+    xrd_fetch_failed: "impossibile recuperare il xrd dall'account %{account}"

config/locales/diaspora/pl.yml

@@ -109,7 +109,7 @@ pl:
       login_here: "zaloguj się"
       ownership: "Własność"
       ownership_explanation: "Twoje zdjęcia są Twoją własnością i nie musisz zrzekać się tego prawa, aby się nimi dzielić. Zarządzasz swoim prawem własności w stosunku do wszystkich materiałów umieszczanych w Diasporze, dzięki czemu masz kontrolę nad sposobem ich rozpowszechniania."
-      share_what_you_want: "Podziel się czym chcesz i z kim chcesz."
+      share_what_you_want: "Dziel się czym chcesz i z kim chcesz."
       simplicity: "Prostota"
       simplicity_explanation: "Diaspora sprawia, że dzielenie się ze znajomymi jest miłe, łatwe i przyjemne, zwłaszcza w odniesieniu do ochrony prywatności. Dbając o prywatność Dispora nie każe Ci korzystać z mnóstwa stron ustawień czy opcji, przez które trzeba się przedzierać, aby zabezpieczyć profil."
   invitations: 
@@ -286,7 +286,7 @@ pl:
   shared: 
     add_contact: 
       create_request: "Znajdź po identyfikatorze Diaspory"
-      diaspora_handle: "identyfikator@w.diasporze"
+      diaspora_handle: "identyfikator@diaspory"
       enter_a_diaspora_username: "Wpisz nazwę użytkownika Diaspory:"
       know_email: "Znasz adres e-mail tej osoby? Może warto ją zaprosić?"
       your_diaspora_username_is: "Twój identyfikator w Diasporze: %{diaspora_handle}"
@@ -391,7 +391,7 @@ pl:
       password_not_changed: "Nie udało się zmienić hasła"
   webfinger: 
     fetch_failed: "Nie udało się pobrać profilu Webfinger dla %{profile_url}"
-    hcard_fetch_failed: "Wystąpił problem podczas pobierania zbioru hcard dla #{@account}"
+    hcard_fetch_failed: "Wystąpił problem podczas pobierania wizytówki hcard użytkownika %{account}"
     no_person_constructed: "Nie udało się stworzyć osoby używając tego zbioru hcard."
-    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    not_enabled: "Usługa Webfinger nie działa w systemie utrzymującym konto użytkownika %{account}"
     xrd_fetch_failed: "wystąpił błąd podczas pobierania xrd z konta %{account}"

config/locales/diaspora/ru.yml

@@ -89,10 +89,10 @@ ru:
       comment: "Комментарий"
       commenting: "Комментирование ..."
   contacts: 
-    few: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
-    zero: "no contacts"
+    few: "%{count} контактов"
+    one: "1 контакт"
+    other: "%{count} контактов"
+    zero: "ни одного контакта"
   delete: "Удаление"
   email: "Email"
   error_messages: 
@@ -142,10 +142,10 @@ ru:
       logout: "выйти"
       view_profile: "просмотр профиля"
   new_requests: 
-    few: "%{count} new requests!"
-    one: "new request!"
-    other: "%{count} new requests!"
-    zero: "no new requests"
+    few: "%{count} новых запросов!"
+    one: "новый запрос!"
+    other: "%{count} новых запросов!"
+    zero: "новых запросов нет"
   notifier: 
     diaspora: "почтовый робот Диаспоры"
     hello: "Привет %{name}!"
@@ -162,8 +162,8 @@ ru:
   ok: "Ок"
   or: "или"
   pagination: 
-    next: "Next"
-    previous: "Previous"
+    next: "Следующая"
+    previous: "Предыдущая"
   password: "Пароль"
   password_confirmation: "Подтверждение пароля"
   people: 
@@ -338,8 +338,8 @@ ru:
     show: 
       destroy: "Уничтожить"
   stream_helper: 
-    hide_comments: "hide comments"
-    show_comments: "show comments"
+    hide_comments: "скрыть комментарии"
+    show_comments: "комментарии"
   the_world: "мир"
   username: "Пользователь"
   users: 
@@ -367,7 +367,7 @@ ru:
         aspect_name: "Имя аспекта"
         description: "Укажите какие аспекты будут доступны для просмотра вашим контактам. Вы сможете изменять их в будущем, нажав на вкладку Управление в правом верхнем углу. Ваши аспекты уникальны и не видны другим."
         drag_to_add: "Перетащите их в ваш аспект"
-        no_requests: "You have no requests"
+        no_requests: "У вас нет запросов"
         your_aspects: "Ваши аспекты"
         your_inviter: "Здесь люди ожидающие вас:"
       step_3: 
@@ -390,7 +390,7 @@ ru:
       password_changed: "Пароль изменён"
       password_not_changed: "Неудачное изменение пароля "
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
+    fetch_failed: "Не удалось получить профиль для %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"

lib/log_overrider.rb

@@ -3,7 +3,8 @@ class ActionView::LogSubscriber
     message = "event=render "
     message << "template=#{from_rails_root(event.payload[:identifier])} "
     message << "layout=#{from_rails_root(event.payload[:layout])} " if event.payload[:layout]
-    message << "ms=#{("%.1f" % event.duration)}"
+    message << "ms=#{("%.1f" % event.duration)} "
+    #message << "r_id=#{event.transaction_id} "
     Rails.logger.info(message)
   end
   alias :render_partial :render_template
@@ -24,7 +25,8 @@ class ActionController::LogSubscriber
     log_string << "controller=#{payload[:controller]} action=#{payload[:action]} format=#{payload[:formats].first.to_s.upcase} "
     log_string << "ms=#{"%.0f" % event.duration} "
     log_string << "params='#{params.inspect}' " unless params.empty?
-    log_string << "additions='#{additions.join(" | ")}'" unless additions.blank?
+    #log_string << "additions='#{additions.join(" | ")}' " unless additions.blank?
+    log_string << "r_id=#{event.transaction_id} "
 
     Rails.logger.info(log_string)
   end

spec/controllers/home_controller_spec.rb

@@ -27,11 +27,48 @@ describe HomeController do
   end
 
   #This describe should apply to any controller class.  HomeController is just the simplest.
-  describe 'logging' do
+  describe 'log overriding in lib/log_overrider' do
     before do
-      logger = FakeLogger.new
       Rails.stub(:logger).and_return(FakeLogger.new)
     end
+    context 'cross-stage' do
+      before do
+        get :show
+        @lines = Rails.logger.infos
+        @id = @lines.first.match(/r_id=(\w+)\s/).captures.first
+      end
+      it 'logs a unified id in a request' do
+        pending "This might require patching Rails"
+        id = @lines.first.match(/r_id=(\w+)\s/).captures.first
+        @lines.each do |line| 
+          line.match(/r_id=(\w+)\s/).captures.first.should == @id
+        end
+      end
+      it 'logs different ids in different requests' do
+        pending "This might require patching Rails"
+        get :show
+        old_lines = Rails.logger.infos.select do |line| 
+          line.match(/r_id=(\w+)\s/).captures.first == @id
+        end 
+        old_lines.length.should == Rails.logger.infos.length/2
+      end
+    end
+    context 'rendering' do
+      before do
+        get :show, :lasers => 'green'
+        @lines = Rails.logger.infos.select{|l| l.include?("event=render")}
+      end
+      it 'logs all renders' do
+        @lines.length.should == 2
+      end
+      it 'logs layouts' do
+        pending 'where is the template=home/show line?'
+        home_line = @lines.detect{|t| 
+          t.include?("template=home/show.html.haml")}
+        home_line.should match /layout=layouts\/application/
+      end
+
+    end
     context 'completion' do
       context 'ok' do
         before do