From 79b800656a71409b7a63e9bf22b6a0f959e088da Mon Sep 17 00:00:00 2001 From: Evan Harris Date: Mon, 24 Jun 2019 20:59:04 -0500 Subject: [PATCH] Cleanup siebling -> sibling mis-spellings --- .../airsonic/player/controller/MainController.java | 12 ++++++------ .../src/main/webapp/WEB-INF/jsp/albumMain.jsp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java index e629d64c..ebde83a1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java @@ -129,9 +129,9 @@ public class MainController { map.put("brand", settingsService.getBrand()); map.put("viewAsList", isViewAsList(request, userSettings)); if (dir.isAlbum()) { - List sieblingAlbums = getSieblingAlbums(dir); - thereIsMoreSAlbums = trimToSize(showAll, sieblingAlbums, userPaginationPreference); - map.put("sieblingAlbums", sieblingAlbums); + List siblingAlbums = getSiblingAlbums(dir); + thereIsMoreSAlbums = trimToSize(showAll, siblingAlbums, userPaginationPreference); + map.put("siblingAlbums", siblingAlbums); map.put("artist", guessArtist(children)); map.put("album", guessAlbum(children)); map.put("musicBrainzReleaseId", guessMusicBrainzReleaseId(children)); @@ -277,13 +277,13 @@ public class MainController { return result; } - private List getSieblingAlbums(MediaFile dir) { + private List getSiblingAlbums(MediaFile dir) { List result = new ArrayList<>(); MediaFile parent = mediaFileService.getParentOf(dir); if (!mediaFileService.isRoot(parent)) { - List sieblings = mediaFileService.getChildrenOf(parent, false, true, true); - result.addAll(sieblings.stream().filter(siebling -> siebling.isAlbum() && !siebling.equals(dir)).collect(Collectors.toList())); + List siblings = mediaFileService.getChildrenOf(parent, false, true, true); + result.addAll(siblings.stream().filter(sibling -> sibling.isAlbum() && !sibling.equals(dir)).collect(Collectors.toList())); } return result; } diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp index ac9eb872..8f4d0ff4 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp @@ -437,7 +437,7 @@ - + @@ -461,7 +461,7 @@
- +