From b8eb653e196264497f6428a86ebb80c2ad6948a9 Mon Sep 17 00:00:00 2001 From: Tom Powell Date: Wed, 5 Apr 2017 22:12:57 -0700 Subject: [PATCH] Remove jamstash --- .../libresonic/player/controller/MoreController.java | 4 ---- .../player/i18n/ResourceBundle_cs.properties | 5 ----- .../player/i18n/ResourceBundle_de.properties | 3 --- .../player/i18n/ResourceBundle_en.properties | 3 --- .../player/i18n/ResourceBundle_et.properties | 3 --- .../player/i18n/ResourceBundle_ja_JP.properties | 3 --- .../player/i18n/ResourceBundle_zh_TW.properties | 3 --- libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp | 10 ---------- 8 files changed, 34 deletions(-) diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java index 14cf9b35..347cd0fb 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java @@ -23,7 +23,6 @@ import org.libresonic.player.domain.MusicFolder; import org.libresonic.player.domain.Player; import org.libresonic.player.domain.User; import org.libresonic.player.service.*; -import org.libresonic.player.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -70,8 +69,6 @@ public class MoreController { } - StringBuilder jamstashUrl = new StringBuilder("http://jamstash.com/#/settings?u=" + StringUtil.urlEncode(user.getUsername()) + "&url="); - jamstashUrl.append(StringUtil.urlEncode(NetworkService.getBaseUrl(request))); Player player = playerService.getPlayer(request, response); ModelAndView result = new ModelAndView(); @@ -83,7 +80,6 @@ public class MoreController { map.put("musicFolders", musicFolders); map.put("clientSidePlaylist", player.isExternalWithPlaylist() || player.isWeb()); map.put("brand", settingsService.getBrand()); - map.put("jamstashUrl", jamstashUrl); return result; } } diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties index dcd9575e..7c7f6608 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties @@ -227,11 +227,6 @@ more.apps.title = Aplikace Libresonicu more.apps.text =

Vyzkou\u0161ejte neust\u00E1le rostouc\u00ED seznam aplikac\u00ED Libresonicu. \ Poskytuj\u00ED z\u00E1bavu a alternativn\u00ED zp\u016Fsoby, jak si u\u017E\u00EDt svou sb\u00EDrku m\u00E9di\u00ED - bez ohledu na to, kde se nach\u00E1z\u00EDte. \ Aplikace jsou dostupn\u00E9 pro Android, iPhone, Windows Phone, BlackBerry, Roku a spoustu dal\u0161\u00EDch.

-more.minisub.title = MiniSub -more.minisub.text =

MiniSub je HTML5 minip\u0159ehr\u00E1va\u010D pro Libresonic. \ - Je sou\u010D\u00E1st\u00ED webov\u00E9 aplikace Libresonicu, pro jeho spu\u0161t\u011Bn\u00ED klikn\u011Bte sem, \ - nebo nav\u0161tivte str\u00E1nku GitHub pro z\u00EDsk\u00E1n\u00ED nejnov\u011Bj\u0161\u00ED verze. \ - Je tak\u00E9 dostupn\u00FD jako aplikace Chrome.

more.mobile.title = Mobiln\u00ED telefon more.mobile.text =

{0} m\u016F\u017Eete ovl\u00E1dat prost\u0159ednictv\u00EDm libovoln\u00E9ho telefonu nebo PDA vybaven\u00E9ho technologi\u00ED WAP.
\ Jednodu\u0161e nav\u0161tivte n\u00E1sleduj\u00EDc\u00ED adresu ze sv\u00E9ho telefonu: http://yourhostname/wap

\ diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties index a046a3db..10a8eabb 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties @@ -226,9 +226,6 @@ more.apps.text =

Schauen sie in die stetig wachsende Liste der Klicke hier um ihn zu starten. \ - Auch verf\u00FCgbar als Chrome App.

more.status.title = Netzwerk Status more.status.text = \u00DCberwache den Echtzeit-Status all deiner Netzwerk-Medienstreams. diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties index b6621106..0cf4985f 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties @@ -256,9 +256,6 @@ more.apps.title = Libresonic Apps more.apps.text =

Check out the steadily growing list of Libresonic apps. \ These provide fun and alternative ways to enjoy your media collection - no matter where you are. \ Apps are available for Android, iPhone, Windows Phone, BlackBerry, Roku and many more.

-more.jamstash.title = JamStash -more.jamstash.text =

Jamstash is an HTML5 player for Libresonic. Click here to start it. \ - Also available as a Chrome App.

more.status.title = Network Status more.status.text = Monitor the real-time status of all network media streams. more.keyboard.title = Keyboard Shortcuts diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties index 83f5a73e..f588927b 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties @@ -227,9 +227,6 @@ more.apps.title = Libresonicu rakendused more.apps.text =

Minge uurige uusi ja ägedaid Libresonicu rakendusi. \ Need teevad sinu meedia kollektsiooni nautimise lõbusamaks ja pakub alternatiivseid viise selleks - asukohast hoolimata. \ Rakendused on saadavad järgmistele nutitelefonidele: Android, iPhone, Windows Phone, BlackBerry, Roku ja paljud teised.

-more.jamstash.title = JamStash -more.jamstash.text =

Jamstash on Libresonicu HTML5 meediaesitaja. Selle käivitamiseks vajutage siia. \ - Veel leiab selle Chrome rakenduste hulgast.

more.mobile.title = Mobiiltelefon more.mobile.text =

Sa haldad {0} igalt WAP-toetatud mobiiltelefonilt või PDA kaudu.
\ Selleks külastage järgnevat portaali oma mobiiltelefonis: http://sinuvõrgunimi/wap

\ diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties index 5e433115..6eb65464 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties @@ -235,9 +235,6 @@ more.apps.title = Libresonic Apps more.apps.text =

Libresonic apps \u306E\u5145\u5B9F\u306B\u6CE8\u76EE\u3057\u3066\u3044\u3066\u304F\u3060\u3055\u3044\u3002\ \u3053\u308C\u3089\u306E\u30A2\u30D7\u30EA\u7FA4\u306F\u3001\u305F\u3068\u3048\u3042\u306A\u305F\u304C\u3069\u3053\u306B\u3044\u3066\u3082\u97F3\u697D\u3092\u697D\u3057\u3080\u559C\u3073\u3068\u69D8\u3005\u306A\u624B\u6BB5\u3092\u63D0\u4F9B\u3057\u307E\u3059\u3002\ \u30A2\u30D7\u30EA\u306F Android, iPhone, Windows Phone, BlackBerry, Roku, \u305D\u306E\u4ED6\u306E\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u3059\u3002

-more.jamstash.title = JamStash -more.jamstash.text =

Jamstash \u306F Libresonic \u306E\u305F\u3081\u306E HTML5\u30D7\u30EC\u30FC\u30E4\u3067\u3059\u3002\u5229\u7528\u3059\u308B\u306B\u306F\u3053\u3053\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002 \ - \u307E\u305F\u3001Chrome\u30D6\u30E9\u30A6\u30B6\u306E\u30A2\u30D7\u30EA\u3068\u3057\u3066\u5229\u7528\u3067\u304D\u307E\u3059\u3002

more.status.title = \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u72B6\u614B more.status.text = \u30E1\u30C7\u30A3\u30A2\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u4E2D\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u72B6\u614B \u3092\u898B\u308B\u3002 more.mobile.title = \u30E2\u30D0\u30A4\u30EB\u6A5F\u5668\u304B\u3089\u306E\u30A2\u30AF\u30BB\u30B9 diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties index 870aecd8..2caf1afb 100644 --- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties +++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties @@ -236,9 +236,6 @@ more.random.anyfolder = \u4EFB\u610F more.apps.title = Libresonic Apps more.apps.text =

\u652F\u63F4 iPhone, \ Android \u548C AIR\u7684Libresonic apps\u3002

-more.jamstash.title = JamStash -more.jamstash.text =

Jamstash \u662F Libresonic \u7684 HTML5 \u64AD\u653E\u5668\u3002\u9EDE\u9078\u9019\u88E1 \u4F86\u555F\u52D5\u3002 \ - \u4E5F\u53EF\u4EE5\u5728 Chrome App \u5167\u53D6\u5F97\u3002

more.status.title = \u7DB2\u8DEF\u72C0\u614B more.status.text = \u76E3\u63A7\u6240\u6709\u7DB2\u8DEF\u4E32\u6D41\u7684\u5373\u6642\u72C0\u614B\u3002 more.mobile.title = \u79FB\u52D5\u8A2D\u5099 diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp index 69e614e5..846378e4 100644 --- a/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp +++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp @@ -271,16 +271,6 @@ -" target="_blank"> - Jamstash" style="float: right;margin-left: 3em; margin-right: 3em"/> - - -

- " alt=""/> - -

-${model.jamstashUrl} -

" alt=""/>