Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Newsletter localization #4485

Merged
merged 23 commits into from
Feb 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0ad5083
Abstract media servers content into interfaces
sephrat Jan 10, 2022
aeeba5b
Media server entities into abstract classes
sephrat Jan 11, 2022
a309f50
Abstract media server content repository
sephrat Jan 11, 2022
229a89f
First pass at newsletter refactoring
sephrat Jan 11, 2022
94c3410
Minor code clean up
sephrat Jan 14, 2022
cfe5797
Attempt at abstracting repositories (WIP)
sephrat Jan 15, 2022
a48650f
Fixed cast issue
tidusjar Jan 15, 2022
29213b0
Corrected the other properties
tidusjar Jan 15, 2022
9975315
A step towards newsletter refactoring
sephrat Jan 16, 2022
1d816fe
Merge remote-tracking branch 'upstream/develop' into newsletter-refactor
sephrat Jan 16, 2022
468847b
Clean up leftovers
sephrat Jan 16, 2022
71a50ca
Fix broken episodes db interaction
sephrat Jan 16, 2022
3fd43a9
Save absolute URL for Plex content
sephrat Jan 17, 2022
26177e5
Fix broken integration with Plex libraries
sephrat Jan 17, 2022
34bc1f4
Fix error when multiple media servers configured
sephrat Jan 17, 2022
1b6e97a
Fix newsletter being sent if no movies or episodes
sephrat Jan 17, 2022
efb62f7
Fix broken tests
sephrat Jan 17, 2022
2e7c2fc
Remove unneccesary logs
sephrat Jan 18, 2022
45c5c1e
Allow for newsletter localization
sephrat Jan 19, 2022
c862b02
Generate file in English
sephrat Jan 19, 2022
e995044
Merge remote-tracking branch 'upstream/develop' into newsletter-local…
sephrat Feb 1, 2022
6b68c86
Fix unsubscribe text unlocalized by messy merge
sephrat Feb 1, 2022
47d2a12
Fix indentation
sephrat Feb 1, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Ombi.Core/Ombi.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<ProjectReference Include="..\Ombi.Api.Trakt\Ombi.Api.Trakt.csproj" />
<ProjectReference Include="..\Ombi.Api.TvMaze\Ombi.Api.TvMaze.csproj" />
<ProjectReference Include="..\Ombi.Helpers\Ombi.Helpers.csproj" />
<ProjectReference Include="..\Ombi.I18n\Ombi.I18n.csproj" />
<ProjectReference Include="..\Ombi.Notifications\Ombi.Notifications.csproj" />
<ProjectReference Include="..\Ombi.Settings\Ombi.Settings.csproj" />
<ProjectReference Include="..\Ombi.Store\Ombi.Store.csproj" />
Expand Down
30 changes: 30 additions & 0 deletions src/Ombi.I18n/Ombi.I18n.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
<FileVersion>3.0.0.0</FileVersion>
<Version></Version>
<PackageVersion></PackageVersion>
<LangVersion>8.0</LangVersion>
<Configurations>Debug;Release;NonUiBuild</Configurations>
</PropertyGroup>
<ItemGroup>
<Content Include="Resources\*.*">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Compile Update="Resources\Texts.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Texts.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Update="Resources\Texts.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Texts.Designer.cs</LastGenOutput>
</Content>
</ItemGroup>
</Project>
144 changes: 144 additions & 0 deletions src/Ombi.I18n/Resources/Texts.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

147 changes: 147 additions & 0 deletions src/Ombi.I18n/Resources/Texts.fr.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NewAlbums" xml:space="preserve">
<value>Nouveaux Albums</value>
</data>
<data name="NewMovies" xml:space="preserve">
<value>Nouveaux Films</value>
</data>
<data name="NewTV" xml:space="preserve">
<value>Nouvelles séries</value>
</data>
<data name="GenresLabel" xml:space="preserve">
<value>Genres :</value>
</data>
<data name="AlbumTypeLabel" xml:space="preserve">
<value>Type :</value>
</data>
<data name="SeasonLabel" xml:space="preserve">
<value>Saison :</value>
</data>
<data name="EpisodesLabel" xml:space="preserve">
<value>Épisodes :</value>
</data>
<data name="PoweredBy" xml:space="preserve">
<value>Propulsé par</value>
</data>
<data name="Unsubscribe" xml:space="preserve">
<value>Se désinscrire</value>
</data>
</root>
Loading