Merge branch 'release-0.8.9'

diff --git a/pom.xml b/pom.xml
index 7286872..e96a971 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.pterodactylus</groupId>
        <artifactId>sone</artifactId>
-       <version>0.8.8</version>
+       <version>0.8.9</version>
        <dependencies>
                <dependency>
                        <groupId>net.pterodactylus</groupId>

diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
index c9d07c3..307025a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
+++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
@@ -53,7 +53,7 @@ public class UpdateChecker {
        private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
 
        /** The current latest known edition. */
-       private static final int LATEST_EDITION = 61;
+       private static final int LATEST_EDITION = 62;
 
        /** The event bus. */
        private final EventBus eventBus;

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 61095b1..42eeb45 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -104,7 +104,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
        }
 
        /** The version. */
-       public static final Version VERSION = new Version(0, 8, 8);
+       public static final Version VERSION = new Version(0, 8, 9);
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(SonePlugin.class);

diff --git a/src/main/resources/i18n/sone.de.properties b/src/main/resources/i18n/sone.de.properties
index d7a4b9d..1d53d8a 100644 (file)
--- a/src/main/resources/i18n/sone.de.properties
+++ b/src/main/resources/i18n/sone.de.properties
@@ -97,6 +97,7 @@ Page.Index.Button.Post=Abschicken!
 Page.Index.PostList.Title=Nachrichtenliste
 Page.Index.PostList.Text.NoPostYet=Bisher hat noch niemand etwas geschrieben. Sie sollten sofort damit anfangen!
 Page.Index.PostList.Text.FollowSomeSones=Oder vielleicht folgen Sie gar keinen Sones? Werfen Sie doch mal einen Blick auf {link}bekannte Sones{/link} und folgen Sie Sones, die interessant aussehen!
+Page.Index.PostList.Text.AutoFollowOption=Sie können auch automatisch allen neu entdeckten Sones folgen. Das entsprechende Feature können Sie in den {link}Optionen{/link} aktivieren!
 
 Page.New.Title=Neue Nachrichten und Antworten - Sone
 Page.New.Page.Title=Neue Nachrichten und Antworten

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 9ecd0de..a7b9ab4 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -97,6 +97,7 @@ Page.Index.Button.Post=Post!
 Page.Index.PostList.Title=Post Feed
 Page.Index.PostList.Text.NoPostYet=Nobody has written any posts yet. You should probably start it right now!
 Page.Index.PostList.Text.FollowSomeSones=Or maybe you are not following any Sones? Take a look at the list of {link}known Sones{/link} and follow whoever looks interesting!
+Page.Index.PostList.Text.AutoFollowOption=You also have the option of automatically following newly discovered Sones. Take a look at the {link}options{/link} to activate the auto-follow feature!
 
 Page.New.Title=New Posts and Replies - Sone
 Page.New.Page.Title=New Posts and Replies

diff --git a/src/main/resources/i18n/sone.fr.properties b/src/main/resources/i18n/sone.fr.properties
index 94c8b0f..d6dd410 100644 (file)
--- a/src/main/resources/i18n/sone.fr.properties
+++ b/src/main/resources/i18n/sone.fr.properties
@@ -97,6 +97,7 @@ Page.Index.Button.Post=Envoyer!
 Page.Index.PostList.Title=Envoyer du contenu
 Page.Index.PostList.Text.NoPostYet=Personne n'a encore écrit de message. vous devriez probablement commencer maintenant!
 Page.Index.PostList.Text.FollowSomeSones=Peut-être ne suivez vous pas encore de Sones? Jetez un oeil à la liste des {link}Sones connus{/link} et suivez ceux qui pourrait vous intéresser!
+Page.Index.PostList.Text.AutoFollowOption=You also have the option of automatically following newly discovered Sones. Take a look at the {link}options{/link} to activate the auto-follow feature!
 
 Page.New.Title=Nouveaux messages et réponses - Sone
 Page.New.Page.Title=Nouveaux messages et réponses
@@ -454,4 +455,4 @@ Notification.Mention.Text=Vous avez été mentionné dans les messages suivants:
 Notification.SoneIsInserting.Text=Your Sone sone://{0} is now being inserted.
 Notification.SoneIsInserted.Text=Your Sone sone://{0} has been inserted in {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Your Sone sone://{0} could not be inserted.
-# 454-456
+# 100, 454-456

diff --git a/src/main/resources/i18n/sone.ja.properties b/src/main/resources/i18n/sone.ja.properties
index 2c57315..783e2c9 100644 (file)
--- a/src/main/resources/i18n/sone.ja.properties
+++ b/src/main/resources/i18n/sone.ja.properties
@@ -97,6 +97,7 @@ Page.Index.Button.Post=投稿！
 Page.Index.PostList.Title=ポストフィード
 Page.Index.PostList.Text.NoPostYet=誰も投稿していません。ぜひ投稿をスタートしましょう！
 Page.Index.PostList.Text.FollowSomeSones=もしくは誰もフォローしてないですか？　{link}既知のSone{/link}を表示し、面白そうなSoneをフォローしましょう。
+Page.Index.PostList.Text.AutoFollowOption=You also have the option of automatically following newly discovered Sones. Take a look at the {link}options{/link} to activate the auto-follow feature!
 
 Page.New.Title=新しい投稿と返信 - Sone
 Page.New.Page.Title=新しい投稿と返信
@@ -454,3 +455,4 @@ Notification.Mention.Text=次の投稿でメンションされています:
 Notification.SoneIsInserting.Text=あなたのSone sone://{0}は現在インサート中です。
 Notification.SoneIsInserted.Text=あなたのSone sone://{0}は{1,number}{1,choice,0#秒|1#秒|1<秒}でインサートされました。
 Notification.SoneInsertAborted.Text=あなたのSone sone://{0}のインサートに失敗しました。
+# 100

diff --git a/src/main/resources/i18n/sone.no.properties b/src/main/resources/i18n/sone.no.properties
index 92ac37b..b1ce306 100644 (file)
--- a/src/main/resources/i18n/sone.no.properties
+++ b/src/main/resources/i18n/sone.no.properties
@@ -97,6 +97,7 @@ Page.Index.Button.Post=Publiser!
 Page.Index.PostList.Title=Innleggsstrøm
 Page.Index.PostList.Text.NoPostYet=Ingen har skrevet noen innlegg enda. Du burde starte med en gang!
 Page.Index.PostList.Text.FollowSomeSones=Eller kanskje du ikke følger noen Soner? Naviger til {link}Kjente Soner{/link} og følg de som ser interessante ut!
+Page.Index.PostList.Text.AutoFollowOption=You also have the option of automatically following newly discovered Sones. Take a look at the {link}options{/link} to activate the auto-follow feature!
 
 Page.New.Title=Nye innlegg og svar - Sone
 Page.New.Page.Title=Nye innlegg og svar
@@ -454,4 +455,4 @@ Notification.Mention.Text=Du har blitt nevnt i følgende innlegg:
 Notification.SoneIsInserting.Text=Your Sone sone://{0} is now being inserted.
 Notification.SoneIsInserted.Text=Your Sone sone://{0} has been inserted in {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Your Sone sone://{0} could not be inserted.
-# 120-121, 454-456
+# 100, 120-121, 454-456

diff --git a/src/main/resources/i18n/sone.pl.properties b/src/main/resources/i18n/sone.pl.properties
index 6edc20f..5d14335 100644 (file)
--- a/src/main/resources/i18n/sone.pl.properties
+++ b/src/main/resources/i18n/sone.pl.properties
@@ -97,6 +97,7 @@ Page.Index.Button.Post=Napisz!
 Page.Index.PostList.Title=Wątek
 Page.Index.PostList.Text.NoPostYet=Nie ma jeszcze żądnych postów. Można rozpocząć pisanie wątku!
 Page.Index.PostList.Text.FollowSomeSones=Być może nie śledzisz żadnych Sone? Spójrz na tę listę {link}znane Sone{/link} i zacznij kogoś śledzić.
+Page.Index.PostList.Text.AutoFollowOption=You also have the option of automatically following newly discovered Sones. Take a look at the {link}options{/link} to activate the auto-follow feature!
 
 Page.New.Title=Nowe Posty i Odpowiedzi - Sone
 Page.New.Page.Title=Nowe Posty i Odpowiedzi
@@ -454,3 +455,4 @@ Notification.Mention.Text=Zostałeś oznaczony w następujących postach:
 Notification.SoneIsInserting.Text=Twoje Sone sone://{0} jest w tej chili wysyłane.
 Notification.SoneIsInserted.Text=Twoje sone://{0} zostało wysłane w {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Twoje Sone sone://{0} nie mogło zostać wysłane.
+# 100

diff --git a/src/main/resources/i18n/sone.ru.properties b/src/main/resources/i18n/sone.ru.properties
index 09efa9f..c40bd8d 100644 (file)
--- a/src/main/resources/i18n/sone.ru.properties
+++ b/src/main/resources/i18n/sone.ru.properties
@@ -97,6 +97,7 @@ Page.Index.Button.Post=Отправить!
 Page.Index.PostList.Title=Лента сообщений
 Page.Index.PostList.Text.NoPostYet=Никто еще не написал ни одного сообщения. Вам, наверное, следует начать это прямо сейчас!
 Page.Index.PostList.Text.FollowSomeSones=Или возможно вы не подписаны ни на один Sone? Посмотрите на список {link}Известныx Sone{/link} и попдишитесь на всех, кто покажется вам интересным!
+Page.Index.PostList.Text.AutoFollowOption=You also have the option of automatically following newly discovered Sones. Take a look at the {link}options{/link} to activate the auto-follow feature!
 
 Page.New.Title=Новые сообщения и ответы - Sone
 Page.New.Page.Title=Новые сообщения и ответы
@@ -454,4 +455,4 @@ Notification.Mention.Text=Вас упомянули в следующих соо
 Notification.SoneIsInserting.Text=Your Sone sone://{0} is now being inserted.
 Notification.SoneIsInserted.Text=Your Sone sone://{0} has been inserted in {1,number} {1,choice,0#seconds|1#second|1<seconds}.
 Notification.SoneInsertAborted.Text=Your Sone sone://{0} could not be inserted.
-# 120-121, 454-456
+# 100, 120-121, 454-456

diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index ab20441..5e2ed7d 100644 (file)
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -20,7 +20,7 @@
                        <div class="reply-text raw-text<%if !raw> hidden<%/if>"><% originalText></div>
                        <div class="reply-text text<%if raw> hidden<%/if><%if !shortText|match key=parsedText> hidden<%/if>"><% parsedText></div>
                        <div class="reply-text short-text<%if raw> hidden<%/if><%if shortText|match key=parsedText> hidden<%/if>"><% shortText></div>
-                       <%if !shortText|match value=parsedText><%if !raw><a class="expand-reply-text" href="viewPost.html?post=<% reply.post.id|html>&amp;raw=true"><%= View.Post.ShowMore|l10n|html></a><%/if><%/if>
+                       <%if !shortText|match value=parsedText><%if !raw><a class="expand-reply-text" href="viewPost.html?post=<% reply.postId|html>&amp;raw=true"><%= View.Post.ShowMore|l10n|html></a><%/if><%/if>
                        <%if !shortText|match value=parsedText><%if !raw><a class="shrink-reply-text hidden"><%= View.Post.ShowLess|l10n|html></a><%/if><%/if>
                </div>
                <div class="reply-status-line status-line">

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index a5a57f6..f4343fc 100644 (file)
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -13,6 +13,7 @@
                <%foreachelse>
                        <p><%= Page.Index.PostList.Text.NoPostYet|l10n|html></p>
                        <p><%= Page.Index.PostList.Text.FollowSomeSones|l10n|html|replace needle=='{link}' replacement=='<a href="knownSones.html">'|replace needle=='{/link}' replacement=='</a>'></p>
+                       <p><%= Page.Index.PostList.Text.AutoFollowOption|l10n|html|replace needle=='{link}' replacement=='<a href="options.html">'|replace needle=='{/link}' replacement=='</a>'></p>
                <%/foreach>
                <%include include/pagination.html pageParameter==page>
        </div>