From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 16 Jan 2013 06:50:33 +0000 (+0100)
Subject: Add filter for local/remote Sones to “Known Sones” page.
X-Git-Tag: 0.8.5^2~3^2~133
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ff2bb9438e85e9f11d95b7f25ac61d12753369bc;p=Sone.git

Add filter for local/remote Sones to “Known Sones” page.
---

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index b40515a..00568da 100644
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -104,6 +104,10 @@ public class KnownSonesPage extends SoneTemplatePage {
 					return sone.isKnown();
 				}
 			});
+		} else if ("own".equals(filter)) {
+			knownSones = Filters.filteredList(knownSones, Sone.LOCAL_SONE_FILTER);
+		} else if ("not-own".equals(filter)) {
+			knownSones = Filters.filteredList(knownSones, Filters.reverseFilter(Sone.LOCAL_SONE_FILTER));
 		}
 		if ("activity".equals(sortField)) {
 			if ("asc".equals(sortOrder)) {
diff --git a/src/main/resources/i18n/sone.de.properties b/src/main/resources/i18n/sone.de.properties
index e253ad5..d0ec575 100644
--- a/src/main/resources/i18n/sone.de.properties
+++ b/src/main/resources/i18n/sone.de.properties
@@ -117,6 +117,8 @@ Page.KnownSones.Filter.Followed=Nur gefolgte Sones anzeigen
 Page.KnownSones.Filter.NotFollowed=Gefolgte Sones nicht anzeigen
 Page.KnownSones.Filter.New=Nur neue Sones anzeigen
 Page.KnownSones.Filter.NotNew=Neue Sones nicht anzeigen
+Page.KnownSones.Filter.Own=Nur eigene Sones anzeigen
+Page.KnownSones.Filter.NotOwn=Nur fremde Sones anzeigen
 Page.KnownSones.Button.Apply=Anwenden
 Page.KnownSones.Button.FollowAllSones=Allen Sones auf dieser Seite folgen
 Page.KnownSones.Button.UnfollowAllSones=Alle Sones auf dieser Seite entfolgen
diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index 5c4367a..6bab23e 100644
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -117,6 +117,8 @@ Page.KnownSones.Filter.Followed=Show only followed Sones
 Page.KnownSones.Filter.NotFollowed=Hide followed Sones
 Page.KnownSones.Filter.New=Show only new Sones
 Page.KnownSones.Filter.NotNew=Hide new Sones
+Page.KnownSones.Filter.Own=Show only local Sones
+Page.KnownSones.Filter.NotOwn=Show only remote Sones
 Page.KnownSones.Button.Apply=Apply
 Page.KnownSones.Button.FollowAllSones=Follow all Sones on this page
 Page.KnownSones.Button.UnfollowAllSones=Unfollow all Sones on this page
diff --git a/src/main/resources/i18n/sone.fr.properties b/src/main/resources/i18n/sone.fr.properties
index 12a44d4..2d978fc 100644
--- a/src/main/resources/i18n/sone.fr.properties
+++ b/src/main/resources/i18n/sone.fr.properties
@@ -117,6 +117,8 @@ Page.KnownSones.Filter.Followed=Montrer seulement les Sones suivis
 Page.KnownSones.Filter.NotFollowed=Cacher les Sones suivis
 Page.KnownSones.Filter.New=Montrer seulement les nouveaux Sones
 Page.KnownSones.Filter.NotNew=Cacher les nouveaux Sones
+Page.KnownSones.Filter.Own=Show only local Sones
+Page.KnownSones.Filter.NotOwn=Show only remote Sones
 Page.KnownSones.Button.Apply=Appliquer
 Page.KnownSones.Button.FollowAllSones=Suivre tous les Sones de cette page
 Page.KnownSones.Button.UnfollowAllSones=Ne plus suivre tous les Sones de cette page
@@ -450,3 +452,4 @@ Notification.ImageInsertFailed.Text=Les images suivantes ne peuvent être insér
 Notification.Mention.ShortText=Vous avez été mentionné.
 Notification.Mention.Text=Vous avez été mentionné dans les messages suivants:
 Notification.SoneInsert.Duration={0,number} {0,choice,0#seconds|1#second|1<seconds}
+# 120-121
diff --git a/src/main/resources/i18n/sone.ja.properties b/src/main/resources/i18n/sone.ja.properties
index b31ff61..cf6e026 100644
--- a/src/main/resources/i18n/sone.ja.properties
+++ b/src/main/resources/i18n/sone.ja.properties
@@ -117,6 +117,8 @@ Page.KnownSones.Filter.Followed=フォローしているSoneのみ表示
 Page.KnownSones.Filter.NotFollowed=フォローしているSoneを隠す
 Page.KnownSones.Filter.New=新しいSoneのみ表示
 Page.KnownSones.Filter.NotNew=新しいSoneを隠す
+Page.KnownSones.Filter.Own=Show only local Sones
+Page.KnownSones.Filter.NotOwn=Show only remote Sones
 Page.KnownSones.Button.Apply=実行
 Page.KnownSones.Button.FollowAllSones=このページ内の全てのSoneをフォロー
 Page.KnownSones.Button.UnfollowAllSones=このページ内の全てのフォローを解除
@@ -450,3 +452,4 @@ Notification.ImageInsertFailed.Text=次の画像のインサートに失敗し
 Notification.Mention.ShortText=誰かにメンションされました。
 Notification.Mention.Text=次の投稿でメンションされています:
 Notification.SoneInsert.Duration={0,number} {0,choice,0#秒|1#秒|1<秒}
+# 120-121
diff --git a/src/main/resources/i18n/sone.no.properties b/src/main/resources/i18n/sone.no.properties
index 3a7175d..c61d7a5 100644
--- a/src/main/resources/i18n/sone.no.properties
+++ b/src/main/resources/i18n/sone.no.properties
@@ -117,6 +117,8 @@ Page.KnownSones.Filter.Followed=Vis bare soner som følges
 Page.KnownSones.Filter.NotFollowed=Gjem Soner som følges
 Page.KnownSones.Filter.New=Vis bare nye Soner
 Page.KnownSones.Filter.NotNew=Gjem nye Soner
+Page.KnownSones.Filter.Own=Show only local Sones
+Page.KnownSones.Filter.NotOwn=Show only remote Sones
 Page.KnownSones.Button.Apply=Tilføy
 Page.KnownSones.Button.FollowAllSones=Følg alle Soner på denne siden
 Page.KnownSones.Button.UnfollowAllSones=Slutt å følge alle Soner på denne siden
@@ -450,3 +452,4 @@ Notification.ImageInsertFailed.Text=De følgende bildene kunne ikke bli innsatt:
 Notification.Mention.ShortText=Du har blitt nevnt:
 Notification.Mention.Text=Du har blitt nevnt i følgende innlegg:
 Notification.SoneInsert.Duration={0,number} {0,choice,0#sekund|1#sekund|1<sekunder}
+# 120-121
diff --git a/src/main/resources/i18n/sone.pl.properties b/src/main/resources/i18n/sone.pl.properties
index a19ea96..caac397 100644
--- a/src/main/resources/i18n/sone.pl.properties
+++ b/src/main/resources/i18n/sone.pl.properties
@@ -117,6 +117,8 @@ Page.KnownSones.Filter.Followed=Pokazuj tylko śledzone Sone
 Page.KnownSones.Filter.NotFollowed=Ukryj śledzone Sone
 Page.KnownSones.Filter.New=Pokazuj tylko nowe Sone
 Page.KnownSones.Filter.NotNew=Ukryj nowe Sone
+Page.KnownSones.Filter.Own=Show only local Sones
+Page.KnownSones.Filter.NotOwn=Show only remote Sones
 Page.KnownSones.Button.Apply=Zastosuj
 Page.KnownSones.Button.FollowAllSones=Śledź wszystkie Sone na tej stronie
 Page.KnownSones.Button.UnfollowAllSones=Przestań śledzić wszystkie Sone na tej stronie
@@ -450,3 +452,4 @@ Notification.ImageInsertFailed.Text=Nie można załadowac następujących obraz
 Notification.Mention.ShortText=Zostałeś oznaczony.
 Notification.Mention.Text=Zostałeś oznaczony w następujących postach:
 Notification.SoneInsert.Duration={0,number} {0,choice,0#seconds|1#second|1<seconds}
+# 120-121
diff --git a/src/main/resources/i18n/sone.ru.properties b/src/main/resources/i18n/sone.ru.properties
index 8263074..b34c905 100644
--- a/src/main/resources/i18n/sone.ru.properties
+++ b/src/main/resources/i18n/sone.ru.properties
@@ -117,6 +117,8 @@ Page.KnownSones.Filter.Followed=Показывать только Sone, на к
 Page.KnownSones.Filter.NotFollowed=Скрыть Sone, на которые вы подписаны
 Page.KnownSones.Filter.New=Показывать только новые Sone
 Page.KnownSones.Filter.NotNew=Скрыть новые Sone
+Page.KnownSones.Filter.Own=Show only local Sones
+Page.KnownSones.Filter.NotOwn=Show only remote Sones
 Page.KnownSones.Button.Apply=Применить
 Page.KnownSones.Button.FollowAllSones=Подписаться на все Sone на этой странице
 Page.KnownSones.Button.UnfollowAllSones=Снять подписку со всех Sone на этой странице
@@ -450,3 +452,4 @@ Notification.ImageInsertFailed.Text=Следующие изображения н
 Notification.Mention.ShortText=Вас упомянули.
 Notification.Mention.Text=Вас упомянули в следующих сообщениях:
 Notification.SoneInsert.Duration={0,number} {0,choice,0#секунд|1#секунда|2#секунды|4<секунд}
+# 120-121
diff --git a/src/main/resources/templates/knownSones.html b/src/main/resources/templates/knownSones.html
index 4ace659..c113748 100644
--- a/src/main/resources/templates/knownSones.html
+++ b/src/main/resources/templates/knownSones.html
@@ -48,6 +48,8 @@
 						<%/if>
 						<option value="new"<%if filter|match value=="new"> selected="selected"<%/if>><%= Page.KnownSones.Filter.New|l10n|html></option>
 						<option value="not-new"<%if filter|match value=="not-new"> selected="selected"<%/if>><%= Page.KnownSones.Filter.NotNew|l10n|html></option>
+						<option value="own"<%if filter|match value=="own"> selected="selected"<%/if>><%= Page.KnownSones.Filter.Own|l10n|html></option>
+						<option value="not-own"<%if filter|match value=="not-own"> selected="selected"<%/if>><%= Page.KnownSones.Filter.NotOwn|l10n|html></option>
 					</select>
 				</div>
 			<%/if>