Browse Source

move interface to model

Luke Pulverenti 8 years ago
parent
commit
edbe28d9fc
43 changed files with 43 additions and 46 deletions
  1. 1 1
      MediaBrowser.Api/ItemUpdateService.cs
  2. 1 1
      MediaBrowser.Api/Library/LibraryService.cs
  3. 1 2
      MediaBrowser.Api/LocalizationService.cs
  4. 1 1
      MediaBrowser.Api/Movies/TrailersService.cs
  5. 1 1
      MediaBrowser.Api/Reports/ReportsService.cs
  6. 1 1
      MediaBrowser.Api/UserLibrary/ItemsService.cs
  7. 1 1
      MediaBrowser.Controller/Entities/BaseItem.cs
  8. 0 1
      MediaBrowser.Controller/MediaBrowser.Controller.csproj
  9. 1 1
      MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs
  10. 1 1
      MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
  11. 1 1
      MediaBrowser.Dlna/Didl/DidlBuilder.cs
  12. 1 1
      MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
  13. 1 1
      MediaBrowser.Dlna/PlayTo/PlayToController.cs
  14. 1 1
      MediaBrowser.Dlna/PlayTo/PlayToManager.cs
  15. 3 4
      MediaBrowser.Model/Globalization/ILocalizationManager.cs
  16. 1 0
      MediaBrowser.Model/MediaBrowser.Model.csproj
  17. 1 1
      MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
  18. 1 1
      MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
  19. 1 1
      MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
  20. 1 1
      MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
  21. 1 1
      MediaBrowser.Providers/Movies/MovieDbProvider.cs
  22. 1 1
      MediaBrowser.Providers/TV/DummySeasonProvider.cs
  23. 1 1
      MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
  24. 1 1
      MediaBrowser.Providers/TV/SeriesMetadataService.cs
  25. 1 1
      MediaBrowser.Providers/TV/SeriesPostScanTask.cs
  26. 1 1
      MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs
  27. 1 1
      MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs
  28. 1 1
      MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs
  29. 1 1
      MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs
  30. 1 1
      MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs
  31. 1 1
      MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
  32. 1 1
      MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs
  33. 1 1
      MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
  34. 1 1
      MediaBrowser.Server.Implementations/Library/UserViewManager.cs
  35. 1 1
      MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
  36. 0 1
      MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
  37. 1 1
      MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs
  38. 1 1
      MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs
  39. 1 1
      MediaBrowser.Server.Implementations/Sorting/OfficialRatingComparer.cs
  40. 1 1
      MediaBrowser.Server.Startup.Common/ApplicationHost.cs
  41. 1 1
      MediaBrowser.ServerApplication/ServerNotifyIcon.cs
  42. 1 1
      MediaBrowser.WebDashboard/Api/DashboardService.cs
  43. 1 1
      MediaBrowser.WebDashboard/Api/PackageCreator.cs

+ 1 - 1
MediaBrowser.Api/ItemUpdateService.cs

@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
@@ -15,6 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Api
 {

+ 1 - 1
MediaBrowser.Api/Library/LibraryService.cs

@@ -7,7 +7,6 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.TV;
@@ -25,6 +24,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Api.Library
 {

+ 1 - 2
MediaBrowser.Api/LocalizationService.cs

@@ -1,5 +1,4 @@
-using MediaBrowser.Controller.Localization;
-using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using ServiceStack;

+ 1 - 1
MediaBrowser.Api/Movies/TrailersService.cs

@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
 using MediaBrowser.Controller.Collections;
-using MediaBrowser.Controller.Localization;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Api.Movies

+ 1 - 1
MediaBrowser.Api/Reports/ReportsService.cs

@@ -5,10 +5,10 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Globalization;
 using System.Linq;
-using MediaBrowser.Controller.Localization;
 using System;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Api.Reports
 {

+ 1 - 1
MediaBrowser.Api/UserLibrary/ItemsService.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
@@ -11,6 +10,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Api.UserLibrary
 {

+ 1 - 1
MediaBrowser.Controller/Entities/BaseItem.cs

@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Configuration;
@@ -27,6 +26,7 @@ using CommonIO;
 using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Providers;
 

+ 0 - 1
MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -205,7 +205,6 @@
     <Compile Include="LiveTv\TimerEventInfo.cs" />
     <Compile Include="LiveTv\TimerInfo.cs" />
     <Compile Include="LiveTv\TunerChannelMapping.cs" />
-    <Compile Include="Localization\ILocalizationManager.cs" />
     <Compile Include="MediaEncoding\ChapterImageRefreshOptions.cs" />
     <Compile Include="MediaEncoding\EncodingJobOptions.cs" />
     <Compile Include="MediaEncoding\IEncodingManager.cs" />

+ 1 - 1
MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs

@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Dlna.Service;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Logging;
@@ -13,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Dlna.ContentDirectory
 {

+ 1 - 1
MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs

@@ -6,7 +6,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Dlna.Didl;
 using MediaBrowser.Dlna.Server;
 using MediaBrowser.Dlna.Service;
@@ -24,6 +23,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Dlna.ContentDirectory
 {

+ 1 - 1
MediaBrowser.Dlna/Didl/DidlBuilder.cs

@@ -6,7 +6,6 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Dlna.ContentDirectory;
 using MediaBrowser.Model.Dlna;
@@ -21,6 +20,7 @@ using System.Linq;
 using System.Xml;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Dlna.Didl
 {

+ 1 - 1
MediaBrowser.Dlna/Main/DlnaEntryPoint.cs

@@ -6,7 +6,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Dlna.PlayTo;
@@ -18,6 +17,7 @@ using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Globalization;
 using Rssdp;
 using Rssdp.Infrastructure;
 

+ 1 - 1
MediaBrowser.Dlna/PlayTo/PlayToController.cs

@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Dlna.Didl;
 using MediaBrowser.Model.Dlna;
@@ -20,6 +19,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Dlna.PlayTo
 {

+ 1 - 1
MediaBrowser.Dlna/PlayTo/PlayToManager.cs

@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Session;
@@ -15,6 +14,7 @@ using System.Net;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Dlna.PlayTo
 {

+ 3 - 4
MediaBrowser.Controller/Localization/ILocalizationManager.cs → MediaBrowser.Model/Globalization/ILocalizationManager.cs

@@ -1,8 +1,7 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
 
-namespace MediaBrowser.Controller.Localization
+namespace MediaBrowser.Model.Globalization
 {
     /// <summary>
     /// Interface ILocalizationManager

+ 1 - 0
MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -138,6 +138,7 @@
     <Compile Include="Health\IHealthMonitor.cs" />
     <Compile Include="IO\IMemoryStreamProvider.cs" />
     <Compile Include="IO\StreamDefaults.cs" />
+    <Compile Include="Globalization\ILocalizationManager.cs" />
     <Compile Include="MediaInfo\LiveStreamRequest.cs" />
     <Compile Include="MediaInfo\LiveStreamResponse.cs" />
     <Compile Include="MediaInfo\PlaybackInfoRequest.cs" />

+ 1 - 1
MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs

@@ -3,7 +3,6 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -18,6 +17,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.BoxSets
 {

+ 1 - 1
MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs

@@ -7,7 +7,6 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
@@ -22,6 +21,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.MediaInfo
 {

+ 1 - 1
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs

@@ -7,7 +7,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
@@ -27,6 +26,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.MediaInfo
 {

+ 1 - 1
MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs

@@ -1,6 +1,5 @@
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using System;
@@ -8,6 +7,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.MediaInfo
 {

+ 1 - 1
MediaBrowser.Providers/Movies/MovieDbProvider.cs

@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -19,6 +18,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Common;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Net;
 
 namespace MediaBrowser.Providers.Movies

+ 1 - 1
MediaBrowser.Providers/TV/DummySeasonProvider.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -10,6 +9,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Providers/TV/MissingEpisodeProvider.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -15,6 +14,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Providers/TV/SeriesMetadataService.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -11,6 +10,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Providers/TV/SeriesPostScanTask.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -13,6 +12,7 @@ using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
 
 namespace MediaBrowser.Providers.TV

+ 1 - 1
MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeImageProvider.cs

@@ -2,7 +2,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -15,6 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Providers/TV/TheMovieDb/MovieDbEpisodeProvider.cs

@@ -3,7 +3,6 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -16,6 +15,7 @@ using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Providers/TV/TheMovieDb/MovieDbProviderBase.cs

@@ -1,7 +1,6 @@
 using CommonIO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Providers.Movies;
@@ -11,6 +10,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeasonProvider.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -17,6 +16,7 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Providers/TV/TheMovieDb/MovieDbSeriesProvider.cs

@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
@@ -19,6 +18,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Providers.TV
 {

+ 1 - 1
MediaBrowser.Server.Implementations/Channels/ChannelManager.cs

@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Dto;
@@ -28,6 +27,7 @@ using CommonIO;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Server.Implementations.Channels
 {

+ 1 - 1
MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs

@@ -7,7 +7,6 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.Subtitles;
@@ -20,6 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Server.Implementations.EntryPoints
 {

+ 1 - 1
MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs

@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using System;
@@ -14,6 +13,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Server.Implementations.Intros
 {

+ 1 - 1
MediaBrowser.Server.Implementations/Library/UserViewManager.cs

@@ -3,7 +3,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Library;
@@ -14,6 +13,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Server.Implementations.Library
 {

+ 1 - 1
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs

@@ -9,7 +9,6 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Sorting;
@@ -35,6 +34,7 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Server.Implementations.LiveTv.Listings;
 

+ 0 - 1
MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs

@@ -1,6 +1,5 @@
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Serialization;

+ 1 - 1
MediaBrowser.Server.Implementations/Notifications/CoreNotificationTypes.cs

@@ -1,10 +1,10 @@
 using MediaBrowser.Controller;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Notifications;
 using MediaBrowser.Model.Notifications;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.Server.Implementations.Notifications
 {

+ 1 - 1
MediaBrowser.Server.Implementations/Persistence/CleanDatabaseScheduledTask.cs

@@ -16,8 +16,8 @@ using CommonIO;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Tasks;
 using MediaBrowser.Server.Implementations.ScheduledTasks;
 

+ 1 - 1
MediaBrowser.Server.Implementations/Sorting/OfficialRatingComparer.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Sorting;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Server.Implementations.Sorting

+ 1 - 1
MediaBrowser.Server.Startup.Common/ApplicationHost.cs

@@ -24,7 +24,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.FileOrganization;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Notifications;
@@ -106,6 +105,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.News;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Social;

+ 1 - 1
MediaBrowser.ServerApplication/ServerNotifyIcon.cs

@@ -1,11 +1,11 @@
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Startup.Common.Browser;
 using System;
 using System.ComponentModel;
 using System.Windows.Forms;
+using MediaBrowser.Model.Globalization;
 
 namespace MediaBrowser.ServerApplication
 {

+ 1 - 1
MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -1,7 +1,6 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Extensions;
@@ -17,6 +16,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Model.Globalization;
 using WebMarkupMin.Core;
 
 namespace MediaBrowser.WebDashboard.Api

+ 1 - 1
MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
@@ -10,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Globalization;
 using WebMarkupMin.Core;
 
 namespace MediaBrowser.WebDashboard.Api