From: David ‘Bombe’ Roden Date: Mon, 26 May 2014 17:56:07 +0000 (+0200) Subject: Merge branch 'release-0.8.9' X-Git-Tag: 0.8.9^0 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=012d7828324b0ebe36376d795aee99a63bdc4884;hp=f4f5fb752ff9aff0235a907e170c6961576562f6 Merge branch 'release-0.8.9' --- diff --git a/pom.xml b/pom.xml index 7286872..e96a971 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 net.pterodactylus sone - 0.8.8 + 0.8.9 net.pterodactylus 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 --- 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 --- 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 --- 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 --- 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 --- 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<% originalText>
<% parsedText>
<% shortText>
- <%if !shortText|match value=parsedText><%if !raw><%= View.Post.ShowMore|l10n|html><%/if><%/if> + <%if !shortText|match value=parsedText><%if !raw><%= View.Post.ShowMore|l10n|html><%/if><%/if> <%if !shortText|match value=parsedText><%if !raw><%/if><%/if>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index a5a57f6..f4343fc 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -13,6 +13,7 @@ <%foreachelse>

<%= Page.Index.PostList.Text.NoPostYet|l10n|html>

<%= Page.Index.PostList.Text.FollowSomeSones|l10n|html|replace needle=='{link}' replacement==''|replace needle=='{/link}' replacement==''>

+

<%= Page.Index.PostList.Text.AutoFollowOption|l10n|html|replace needle=='{link}' replacement==''|replace needle=='{/link}' replacement==''>

<%/foreach> <%include include/pagination.html pageParameter==page>