Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

10.1.0.0 #297

Merged
merged 18 commits into from
Jul 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 2
updates:
- package-ecosystem: "nuget"
directory: "/core/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -17,7 +17,7 @@ updates:

- package-ecosystem: "nuget"
directory: "/site/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -27,7 +27,7 @@ updates:

- package-ecosystem: "nuget"
directory: "/robot/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -37,7 +37,7 @@ updates:

- package-ecosystem: "npm"
directory: "/site/Tests/Browser/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -47,7 +47,7 @@ updates:

- package-ecosystem: "gradle"
directory: "/android/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -57,7 +57,7 @@ updates:

- package-ecosystem: "docker"
directory: "/ci/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -67,7 +67,7 @@ updates:

- package-ecosystem: "docker"
directory: "/publish/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -77,7 +77,7 @@ updates:

- package-ecosystem: "cargo"
directory: "/version/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand All @@ -87,7 +87,7 @@ updates:

- package-ecosystem: "pip"
directory: "/midna/"
target-branch: "10.1.0.0"
target-branch: "10.2.0.0"
schedule:
interval: "weekly"
labels:
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
ext.testrunner_version = '1.0.2'
ext.expresso_version = '3.0.2'

ext.dfm_version = "10.0.1.0"
ext.dfm_version = "10.1.0.0"

repositories {
google()
Expand Down
4 changes: 2 additions & 2 deletions core/Authentication/Authentication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>DFM.Authentication</AssemblyName>
<RootNamespace>DFM.Authentication</RootNamespace>
<AssemblyVersion>10.0.1.0</AssemblyVersion>
<FileVersion>10.0.1.0</FileVersion>
<AssemblyVersion>10.1.0.0</AssemblyVersion>
<FileVersion>10.1.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions core/BusinessLogic/BusinessLogic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>DFM.BusinessLogic</AssemblyName>
<RootNamespace>DFM.BusinessLogic</RootNamespace>
<AssemblyVersion>10.0.1.0</AssemblyVersion>
<FileVersion>10.0.1.0</FileVersion>
<AssemblyVersion>10.1.0.0</AssemblyVersion>
<FileVersion>10.1.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions core/Email/Email.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>DFM.Email</AssemblyName>
<RootNamespace>DFM.Email</RootNamespace>
<AssemblyVersion>10.0.1.0</AssemblyVersion>
<FileVersion>10.0.1.0</FileVersion>
<AssemblyVersion>10.1.0.0</AssemblyVersion>
<FileVersion>10.1.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 5 additions & 2 deletions core/Email/Email/Base.htm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{CurrentLanguage}}">
<head>
<title>{{Subject}}</title>
</head>
Expand Down Expand Up @@ -33,7 +33,9 @@
target="_blank"
rel="noopener noreferrer"
title="Don't fly Money">
<img src="{{Url}}/assets/images/mail-pig-{{theme-colored}}.png" alt="Don't fly Money" title="Don't fly Money" />
<img src="{{Url}}/assets/images/mail-pig-{{theme-colored}}.png"
alt="{{PinkPigAlt}}"
title="{{PinkPigAlt}}" />
</a>
</div>
</div>
Expand Down Expand Up @@ -62,6 +64,7 @@
border-radius: 10px;
margin: -6px 0 0 0;
"
title="{{MiscImageReading}}"
>
{{Misc}}
</a>
Expand Down
4 changes: 2 additions & 2 deletions core/Email/Email/theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"None": {
"Values": {
"neutral-0": "#FFF",
"neutral-1": "#000"
"neutral-1": "#EEE"
},
"Colors": {
"None": {
"primary-0": "#777",
"primary-0": "#666",
"highlight-1": "#333",
"theme-colored": "on",
}
Expand Down
5 changes: 5 additions & 0 deletions core/Email/Format.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ private Format(
replaces.Add("MiscLeg", misc.Leg);
replaces.Add("MiscBackground", misc.Background);
replaces.Add("MiscBorder", misc.Border);

replaces.Add(
"MiscImageReading",
PlainText.GetMiscText(misc, talkable.Language)
);
}

Subject = replaces["Subject"];
Expand Down
4 changes: 2 additions & 2 deletions core/Entities/Entities.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>DFM.Entities</AssemblyName>
<RootNamespace>DFM.Entities</RootNamespace>
<AssemblyVersion>10.0.1.0</AssemblyVersion>
<FileVersion>10.0.1.0</FileVersion>
<AssemblyVersion>10.1.0.0</AssemblyVersion>
<FileVersion>10.1.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions core/Exchange/Exchange.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>DFM.Exchange</AssemblyName>
<RootNamespace>DFM.Exchange</RootNamespace>
<AssemblyVersion>10.0.1.0</AssemblyVersion>
<FileVersion>10.0.1.0</FileVersion>
<AssemblyVersion>10.1.0.0</AssemblyVersion>
<FileVersion>10.1.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions core/Generic/Generic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>DFM.Generic</AssemblyName>
<RootNamespace>DFM.Generic</RootNamespace>
<AssemblyVersion>10.0.1.0</AssemblyVersion>
<FileVersion>10.0.1.0</FileVersion>
<AssemblyVersion>10.1.0.0</AssemblyVersion>
<FileVersion>10.1.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 6 additions & 2 deletions core/Language/Language.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>DFM.Language</AssemblyName>
<RootNamespace>DFM.Language</RootNamespace>
<AssemblyVersion>10.0.1.0</AssemblyVersion>
<FileVersion>10.0.1.0</FileVersion>
<AssemblyVersion>10.1.0.0</AssemblyVersion>
<FileVersion>10.1.0.0</FileVersion>
</PropertyGroup>

<ItemGroup>
<None Remove="Language\Email\DeleteCsvData.json" />
<None Remove="Language\Email\general.json" />
<None Remove="Language\Email\misc.json" />
<None Remove="Language\Email\MoveNotification.json" />
<None Remove="Language\Email\NoInteraction.json" />
<None Remove="Language\Email\NotSignedContract.json" />
Expand Down Expand Up @@ -40,6 +41,9 @@
</ItemGroup>

<ItemGroup>
<Content Include="Language\Email\misc.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Language\Email\PersonAsked.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
4 changes: 4 additions & 0 deletions core/Language/Language/Email/general.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{
"en-US": {
"CurrentLanguage": "en-US",
"NoLink": "We have NO link with financial institutions.",
"NoReply": "Don't reply this e-mail.",
"OurContact": "Our contact: dfm@dontflymoney.com",
"PinkPigAlt": "Pink Pig, icon of Don't fly Money",
"": null
},
"pt-BR": {
"CurrentLanguage": "pt-BR",
"NoLink": "Não temos vínculos com instituições financeiras.",
"NoReply": "Não responda este e-mail.",
"OurContact": "Nosso contato: dfm@dontflymoney.com",
"PinkPigAlt": "Porquinho rosa, símbolo do Don't fly Money",
"": null
}
}
90 changes: 90 additions & 0 deletions core/Language/Language/Email/misc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"en-US": {
"Start": "Image of a character looking like a ball ",

"Color000": "black",
"Color001": "blue",
"Color010": "green",
"Color100": "red",
"Color111": "white",
"Color110": "yellow",
"Color101": "purple",
"Color011": "cyan",

"Stain000": "black without birthmarks",
"Stain001": "black with birthmark on the head at left side",
"Stain010": "black with birthmark at the left leg",
"Stain100": "black with birthmark at the right arm",
"Stain111": "white without birthmarks",
"Stain110": "white with birthmark on the head at left side",
"Stain101": "white with birthmark at the left leg",
"Stain011": "white with birthmark at the right arm",

"Middle": " having ",

"Eyes00": "one eye",
"Eyes01": "two eyes",
"Eyes10": "three eyes forming a triangle",
"Eyes11": "three eyes forming a triangle upside down",

"Arms0": "two arms with rounded hands",
"Arms1": "two arms with forked hands",

"Legs0": "two legs with rounded feet",
"Legs1": "two legs with forked feet",

"Antenna00": "no antenna",
"Antenna01": "two dog ears shaped antennas",
"Antenna10": "a fountain shape antenna",
"Antenna11": "an antenna with two diagonal pins and a little ball in the top",

"Comma": ", ",
"And": " and ",

"": null
},
"pt-BR": {
"Start": "Imagem de personagem que parece uma bolinha ",

"Color000": "preta",
"Color001": "azul",
"Color010": "verde",
"Color100": "vermelha",
"Color111": "branca",
"Color110": "amarela",
"Color101": "roxa",
"Color011": "ciano",

"Stain000": "preta sem marcas de nascença",
"Stain001": "preta com marca de nascença na cabeça à esquerda",
"Stain010": "preta com marca de nascença na perna esquerda",
"Stain100": "preta com marca de nascença no braço direito",
"Stain111": "branca sem marcas de nascença",
"Stain110": "branca com marca de nascença na cabeça à esquerda",
"Stain101": "branca com marca de nascença na perna esquerda",
"Stain011": "branca com marca de nascença no braço direito",

"Middle": " tendo ",

"Eyes00": "um olho",
"Eyes01": "dois olhos",
"Eyes10": "três olhos formando um triângulo",
"Eyes11": "três olhos formando um triângulo de ponta cabeça",

"Arms0": "dois braços com mãos arredondadas",
"Arms1": "dois braços com mãos bifurcadas",

"Legs0": "duas pernas com pés arredondados",
"Legs1": "duas pernas com pés bifurcados",

"Antenna00": "sem antena",
"Antenna01": "com duas antenas parecidas com orelhas de cachorro",
"Antenna10": "com uma antena que parece uma fonte de água",
"Antenna11": "com uma antena com dois pinos diagonais e uma bolinha na ponta",

"Comma": ", ",
"And": " e ",

"": null
}
}
4 changes: 4 additions & 0 deletions core/Language/Language/Site/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"en-US": {
"CurrentLanguage": "english",

"PinkPigAlt": "Pink Pig, icon of Don't fly Money",

"Enter": "Enter",
"Login": "Login",
"SignUp": "Sign up",
Expand Down Expand Up @@ -167,6 +169,8 @@
"pt-BR": {
"CurrentLanguage": "português",

"PinkPigAlt": "Porquinho rosa, símbolo do Don't fly Money",

"Enter": "Entrar",
"Login": "Entrar",
"SignUp": "Cadastrar-se",
Expand Down
4 changes: 4 additions & 0 deletions core/Language/Language/Version/en-us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"10.1.0.0": [
"Fix accessibility at emails sent by System",
"Fix website images description"
],
"10.0.1.0": [
"Change terms about data after wipe",
"Allow CSV deletion after receiving it at email",
Expand Down
4 changes: 4 additions & 0 deletions core/Language/Language/Version/pt-br.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"10.1.0.0": [
"Arrumada acessibilidade nos e-mails enviados pelo Sistema",
"Arrumada descrição de imagens no site"
],
"10.0.1.0": [
"Mudança nos Termos sobre dados após a exclusão",
"Permitida exclusão de CSV após recebê-lo via email",
Expand Down
Loading
Loading