From 74520804f80974ec018a6c45f4e221276ded4cd3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 21 Dec 2014 13:58:17 -0500
Subject: start on content type setting

---
 .../Library/LibraryManager.cs                           | 17 +++++++++++------
 .../Localization/Server/server.json                     | 12 ++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 9647461bf..ab50c30fb 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1546,12 +1546,17 @@ namespace MediaBrowser.Server.Implementations.Library
             return ItemRepository.RetrieveItem(id);
         }
 
-        /// <summary>
-        /// Finds the type of the collection.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>System.String.</returns>
-        public string FindCollectionType(BaseItem item)
+        public string GetContentType(BaseItem item)
+        {
+            return GetInheritedContentType(item);
+        }
+
+        public string GetInheritedContentType(BaseItem item)
+        {
+            return GetTopFolderContentType(item);
+        }
+
+        private string GetTopFolderContentType(BaseItem item)
         {
             while (!(item.Parent is AggregateFolder) && item.Parent != null)
             {
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 9bf06c50b..9a515d492 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -37,6 +37,18 @@
     "ButtonOk": "Ok",
     "ButtonCancel": "Cancel",
     "ButtonNew": "New",
+    "FolderTypeMixed": "Mixed videos",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV",
+    "FolderTypeInherit": "Inherit",
+    "LabelContentType":  "Content type:",
     "HeaderSetupLibrary": "Setup your media library",
     "ButtonAddMediaFolder": "Add media folder",
     "LabelFolderType": "Folder type:",
-- 
cgit v1.2.3