build(i18n): move Locale directory and use AspNetCore framework (#258)

LizardByte · Mar 24, 2024 · 76b0126 · 76b0126
1 parent 9965542
commit 76b0126
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 9 deletions.
diff --git a/Jellyfin.Plugin.Themerr.Tests/Jellyfin.Plugin.Themerr.Tests.csproj b/Jellyfin.Plugin.Themerr.Tests/Jellyfin.Plugin.Themerr.Tests.csproj
@@ -30,10 +30,6 @@
     <ProjectReference Include="..\Jellyfin.Plugin.Themerr\Jellyfin.Plugin.Themerr.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="..\Jellyfin.Plugin.ThemerrLocale\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="data\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/Jellyfin.Plugin.Themerr/Jellyfin.Plugin.Themerr.csproj b/Jellyfin.Plugin.Themerr/Jellyfin.Plugin.Themerr.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Jellyfin.Controller" Version="10.8.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="YoutubeExplode" Version="6.3.12" />
   </ItemGroup>
@@ -21,7 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Locale\**" />
+    <EmbeddedResource Include="..\Locale\*.json">
+      <LogicalName>Jellyfin.Plugin.Themerr.Locale.%(Filename)%(Extension)</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Jellyfin.Plugin.Themerr/Locale/de.json → Locale/de.json b/Jellyfin.Plugin.Themerr/Locale/de.json → Locale/de.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/en.json → Locale/en.json b/Jellyfin.Plugin.Themerr/Locale/en.json → Locale/en.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/en_GB.json → Locale/en_GB.json b/Jellyfin.Plugin.Themerr/Locale/en_GB.json → Locale/en_GB.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/en_US.json → Locale/en_US.json b/Jellyfin.Plugin.Themerr/Locale/en_US.json → Locale/en_US.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/es.json → Locale/es.json b/Jellyfin.Plugin.Themerr/Locale/es.json → Locale/es.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/fr.json → Locale/fr.json b/Jellyfin.Plugin.Themerr/Locale/fr.json → Locale/fr.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/it.json → Locale/it.json b/Jellyfin.Plugin.Themerr/Locale/it.json → Locale/it.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/ru.json → Locale/ru.json b/Jellyfin.Plugin.Themerr/Locale/ru.json → Locale/ru.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/sv.json → Locale/sv.json b/Jellyfin.Plugin.Themerr/Locale/sv.json → Locale/sv.json
diff --git a/Jellyfin.Plugin.Themerr/Locale/zh.json → Locale/zh.json b/Jellyfin.Plugin.Themerr/Locale/zh.json → Locale/zh.json
diff --git a/crowdin.yml b/crowdin.yml
@@ -9,9 +9,9 @@
 
 "files": [
   {
-    "source": "/Jellyfin.Plugin.Themerr/Locale/en.json",
+    "source": "/Locale/en.json",
     "dest": "/themerr-jellyfin.json",
-    "translation": "/Jellyfin.Plugin.Themerr/Locale/%two_letters_code%.%file_extension%",
+    "translation": "/Locale/%two_letters_code%.%file_extension%",
     "update_option": "update_as_unapproved"
   }
 ]
diff --git a/docs/source/contributing/localization.rst b/docs/source/contributing/localization.rst
@@ -34,7 +34,7 @@ The implementation uses a JSON key-value pair to map the strings to their respec
 
 The following is a simple example of how to use it.
 
-- Add the string to `Jellyfin.Plugin.Themerr/Locale/en.json`, in English.
+- Add the string to `Locale/en.json`, in English.
    .. code-block:: json
 
       {