From 0dfc303c836b60bf3026055067ec4d532eef8304 Mon Sep 17 00:00:00 2001
From: Bat <baptiste@gelez.xyz>
Date: Mon, 18 Jun 2018 18:44:18 +0100
Subject: [PATCH] Fix Blog::find_by_name

---
 po/en.po            | 21 +++++++++++++++++++++
 po/fr.po            | 22 ++++++++++++++++++++++
 po/pl.po            | 38 +++++++++++++++++++++++++++++++++-----
 src/models/blogs.rs |  2 +-
 src/routes/mod.rs   |  2 +-
 5 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/po/en.po b/po/en.po
index 2634ce4e..31d93560 100644
--- a/po/en.po
+++ b/po/en.po
@@ -253,3 +253,24 @@ msgstr ""
 
 msgid "You need to be logged in order to edit your profile"
 msgstr ""
+
+msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}"
+msgstr ""
+
+msgid "{{ data }} reshared your article"
+msgstr ""
+
+msgid "{{ data }} started following you"
+msgstr ""
+
+msgid "{{ data }} liked your article"
+msgstr ""
+
+msgid "{{ data }} commented your article"
+msgstr ""
+
+msgid "We couldn't find this page."
+msgstr ""
+
+msgid "The link that led you here may be broken."
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 55a2a729..22d82224 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -252,3 +252,25 @@ msgstr "Vous devez vous connecter pour suivre quelqu'un"
 
 msgid "You need to be logged in order to edit your profile"
 msgstr "Vous devez vous connecter pour modifier votre profil"
+
+#, fuzzy
+msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}"
+msgstr "Écrit par {{ link_1 }}{{ url }}{{ link_2 }}{{ name }}{{ link_3 }}"
+
+msgid "{{ data }} reshared your article"
+msgstr ""
+
+msgid "{{ data }} started following you"
+msgstr ""
+
+msgid "{{ data }} liked your article"
+msgstr ""
+
+msgid "{{ data }} commented your article"
+msgstr ""
+
+msgid "We couldn't find this page."
+msgstr ""
+
+msgid "The link that led you here may be broken."
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 9340090a..a319828f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 msgid "Latest articles"
 msgstr "Najnowsze artykuły"
@@ -46,7 +47,8 @@ msgid "Something broke on our side."
 msgstr "Coś poszło nie tak."
 
 msgid "Sorry about that. If you think this is a bug, please report it."
-msgstr "Przepraszamy. Jeżeli uważasz że wystąpił błąd, prosimy o zgłoszenie go."
+msgstr ""
+"Przepraszamy. Jeżeli uważasz że wystąpił błąd, prosimy o zgłoszenie go."
 
 msgid "Configuration"
 msgstr "Konfiguracja"
@@ -114,8 +116,8 @@ msgstr "Utwórz wpis"
 msgid "Publish"
 msgstr "Opublikuj"
 
-msgid "Logowanie"
-msgstr "Zaloguj się"
+msgid "Login"
+msgstr ""
 
 msgid "Username or email"
 msgstr "Nazwa użytkownika lub adres e-mail"
@@ -133,7 +135,9 @@ msgid "Your Blogs"
 msgstr "Twoje blogi"
 
 msgid "You don't have any blog yet. Create your own, or ask to join one."
-msgstr "Nie posiadasz żadnego bloga. Utwórz własny, lub poproś o dołączanie do istniejącego."
+msgstr ""
+"Nie posiadasz żadnego bloga. Utwórz własny, lub poproś o dołączanie do "
+"istniejącego."
 
 msgid "Start a new blog"
 msgstr "Utwórz nowy blog"
@@ -252,3 +256,27 @@ msgstr "Musisz się zalogować, aby zacząć obserwować innych"
 msgid "You need to be logged in order to edit your profile"
 msgstr "Musisz się zalogować , aby móc edytować swój profil"
 
+#, fuzzy
+msgid "By {{ link_1 }}{{ link_2 }}{{ link_3 }}{{ name }}{{ link_4 }}"
+msgstr "Napisano przez {{ link_1 }}{{ url }}{{ link_2 }}{{ name }}{{ link_3 }}"
+
+msgid "{{ data }} reshared your article"
+msgstr ""
+
+msgid "{{ data }} started following you"
+msgstr ""
+
+msgid "{{ data }} liked your article"
+msgstr ""
+
+msgid "{{ data }} commented your article"
+msgstr ""
+
+msgid "We couldn't find this page."
+msgstr ""
+
+msgid "The link that led you here may be broken."
+msgstr ""
+
+#~ msgid "Logowanie"
+#~ msgstr "Zaloguj się"
diff --git a/src/models/blogs.rs b/src/models/blogs.rs
index ee1964d3..529bd43d 100644
--- a/src/models/blogs.rs
+++ b/src/models/blogs.rs
@@ -67,7 +67,7 @@ impl Blog {
             .expect("Couldn't load blogs ")
     }
 
-    find_by!(blogs, find_by_name, ap_url as String, instance_id as i32);
+    find_by!(blogs, find_by_name, actor_id as String, instance_id as i32);
 
     pub fn find_local(conn: &PgConnection, name: String) -> Option<Blog> {
         Blog::find_by_name(conn, name, Instance::local_id(conn))
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 89ab2c00..6c33f75b 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -9,7 +9,7 @@ macro_rules! may_fail {
                 let $res = res.unwrap();
                 $block
             } else {
-                Template::render(concat!("errors/", stringify!($template)), json!({
+                Template::render(concat!("errors/", $template), json!({
                     "error_message": $msg
                 }))
             }