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

add new lines #579

Merged
merged 10 commits into from
Apr 4, 2022
19 changes: 7 additions & 12 deletions common/Tests/Frontend.Translations.Tests/LocalesTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public static string BasePath
}

public List<string> Workspaces { get; set; }

public List<TranslationFile> TranslationFiles { get; set; }
public List<JavaScriptFile> JavaScriptFiles { get; set; }
public List<ModuleFolder> ModuleFolders { get; set; }
Expand All @@ -38,6 +37,12 @@ public static string BasePath
public List<ParseJsonError> ParseJsonErrors { get; set; }
public List<JsonEncodingError> WrongEncodingJsonErrors { get; set; }

private static string _md5ExcludesPath = "../../../md5-excludes.json";

private static List<string> md5Excludes = File.Exists(_md5ExcludesPath)
? JsonConvert.DeserializeObject<List<string>>(File.ReadAllText(_md5ExcludesPath))
: new List<string>();

[OneTimeSetUp]
public void Setup()
{
Expand Down Expand Up @@ -339,18 +344,8 @@ public void SpellCheckTest()
[Category("FastRunning")]
public void DublicatesFilesByMD5HashTest()
{
var skipHashes = new List<string>() {
"e6d664afaace71b3a22abb09fc124543",
"5a1d4d36141c7a8ca53f2540f3fd5940",
"6d3334459f062ba0f39de6a38225c564",
"b8e7630201c96d26c94d348447328276",
"3ad0e57ce636af715af3f629e364f1ed",
"dfb129715a0122a29afe233226c648d9",
"ec73989085d4e1b984c1c9dca10524da"
};

var duplicatesByMD5 = TranslationFiles
.Where(t => !skipHashes.Contains(t.Md5Hash))
.Where(t => !md5Excludes.Contains(t.Md5Hash))
.GroupBy(t => t.Md5Hash)
.Where(grp => grp.Count() > 1)
.Select(grp => new { Key = grp.Key, Count = grp.Count(), Paths = grp.ToList().Select(f => f.FilePath) })
Expand Down
11 changes: 11 additions & 0 deletions common/Tests/Frontend.Translations.Tests/md5-excludes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
"e6d664afaace71b3a22abb09fc124543",
"5a1d4d36141c7a8ca53f2540f3fd5940",
"6d3334459f062ba0f39de6a38225c564",
"b8e7630201c96d26c94d348447328276",
"3ad0e57ce636af715af3f629e364f1ed",
"dfb129715a0122a29afe233226c648d9",
"ec73989085d4e1b984c1c9dca10524da",
"d33ce05dc117d3a05c144460e6ce5f4b",
"68b6c4a86f13eb0a609a8fc8d0716b11"
]
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ const commonStyles = css`
`;

const StyledSectionBody = styled.div`
max-width: 100vw !important;
${commonStyles}

${(props) =>
props.withScroll &&
`
Expand All @@ -89,9 +89,8 @@ const StyledSectionBody = styled.div`
margin-left: -24px;
`
}
`}

.additional-scroll-height {
`}
.additional-scroll-height {
${(props) =>
!props.withScroll &&
!props.pinned &&
Expand All @@ -102,9 +101,8 @@ const StyledSectionBody = styled.div`
`;

const StyledDropZoneBody = styled(DragAndDrop)`
${commonStyles}

.drag-and-drop {
max-width: 100vw !important;
${commonStyles} .drag-and-drop {
user-select: none;
height: 100%;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,19 @@ const StyledSectionContainer = styled.section`
display: flex;
flex-direction: column;

width: calc(100vw - 256px);
max-width: calc(100vw - 256px);
width: 100%;
max-width: 100vw;

@media ${tablet} {
width: ${(props) =>
props.showText ? "calc(100vw - 240px)" : "calc(100vw - 52px)"};
max-width: ${(props) =>
props.showText ? "calc(100vw - 240px)" : "calc(100vw - 52px)"};
width: 100%;
max-width: 100vw !important;
padding: 0 0 0 16px;
}

${isMobile &&
css`
width: ${(props) =>
props.showText ? "calc(100vw - 240px)" : "calc(100vw - 52px)"} !important;
max-width: ${(props) =>
props.showText ? "calc(100vw - 240px)" : "calc(100vw - 52px)"} !important;
width: 100% !important;
max-width: 100vw !important
padding: 0 0 0 16px;
${tabletProps};
min-width: 100px;
Expand Down
8 changes: 7 additions & 1 deletion products/ASC.Files/Client/public/locales/az/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"ButtonAddBoxNet": "Box hesabı əlavə et",
"ButtonAddDropBox": "Dropbox hesabı əlavə et",
"ButtonAddGoogle": "Google hesabı əlavə et",
"ButtonAddNextcloud": "Nextcloud hesabı əlavə et",
"ButtonAddSkyDrive": "OneDrive hesabı əlavə et",
"NewDocument": "Yeni Sənəd",
"NewFolder": "Yeni Qovluq",
"NewPresentation": "Yeni Təqdimat",
"NewSpreadsheet": "Yeni Cədvəl",
"UploadFiles": "Faylları yüklə",
"UploadFolder": "Qolvuğu yüklə"
"UploadFolder": "Qolvuğu yüklə",
"Upload": "Yüklə"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/az/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
18 changes: 12 additions & 6 deletions products/ASC.Files/Client/public/locales/bg/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"NewDocument": "Нов документ",
"NewFolder": "Нова папка",
"NewPresentation": "Нова презентация",
"NewSpreadsheet": "Нова таблица",
"UploadFiles": "Качи файлове",
"UploadFolder": "Качи папка"
"ButtonAddBoxNet": "Добавяне на акаунт Box",
"ButtonAddDropBox": "Добавяне на акаунт DropBox",
"ButtonAddGoogle": "Добавяне на акаунт в Google",
"ButtonAddNextcloud": "Добавяне на акаунт Nextcloud",
"ButtonAddSkyDrive": "Добавяне на акаунт OneDrive",
"NewDocument": "Нов документ",
"NewFolder": "Нова папка",
"NewPresentation": "Нова презентация",
"NewSpreadsheet": "Нова таблица",
"UploadFiles": "Качи файлове",
"UploadFolder": "Качи папка",
"Upload": "Качи"
}
5 changes: 4 additions & 1 deletion products/ASC.Files/Client/public/locales/bg/UploadPanel.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"Uploads": "Качвания"
"Uploads": "Качвания",
"EnterPassword": "Въведете паролата",
"HideInput": "Скрий",
"Ready": "Завършен"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/bg/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "В.{{version}}"
}
8 changes: 7 additions & 1 deletion products/ASC.Files/Client/public/locales/cs/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"ButtonAddBoxNet": "Přidat Box účet",
"ButtonAddDropBox": "Přidat Dropbox účet",
"ButtonAddGoogle": "Přidat Google účet",
"ButtonAddNextcloud": "Přidat Nextcloud účet",
"ButtonAddSkyDrive": "Přidat OneDrive účet",
"NewDocument": "Nový dokument",
"NewFolder": "Nová složka",
"NewPresentation": "Nová prezentaec",
"NewSpreadsheet": "Nová tabulka",
"UploadFiles": "Nahrát soubory",
"UploadFolder": "Nahrát složku"
"UploadFolder": "Nahrát složku",
"Upload": "Nahrát"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"SuccessfullyCreated": "Soubor '{{fileTitle}}' vytvořen",
"ConversionPasswordFormCaption": "Zadejte heslo pro uložení šablony",
"ConversionPasswordMasterFormCaption": "Zadejte heslo pro uložení jako oform",
"CreationError": "Chyba při vytváření souboru. Bylo zadáno nesprávné heslo"
}
6 changes: 5 additions & 1 deletion products/ASC.Files/Client/public/locales/cs/UploadPanel.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"Uploads": "Nahráno"
"Uploads": "Nahráno",
"EnterPassword": "Zadat heslo",
"HideInput": "Skrýt",
"Ready": "Hotovo",
"UploadAndConvert": "Nahrát a převést soubory"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/cs/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
5 changes: 3 additions & 2 deletions products/ASC.Files/Client/public/locales/de/Article.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"ButtonAddBoxNet": "Box-Konto hinzufügen",
"ButtonAddDropBox": "Dropbox-Konto hinzufügen",
"ButtonAddGoogle": "Google-Konto hinzufügen",
"ButtonAddNextcloud": "Nextcloud Konto hinzufügen",
"ButtonAddNextcloud": "Nextcloud-Konto hinzufügen",
"ButtonAddSkyDrive": "OneDrive-Konto hinzufügen",
"NewDocument": "Neues Dokument",
"NewFolder": "Neuer Ordner",
"NewPresentation": "Neue Präsentation",
"NewSpreadsheet": "Neue Tabellenkalkulation",
"UploadFiles": "Dateien hochladen",
"UploadFolder": "Ordner hochladen"
"UploadFolder": "Ordner hochladen",
"Upload": "Hochladen"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/de/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
8 changes: 7 additions & 1 deletion products/ASC.Files/Client/public/locales/el/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"ButtonAddBoxNet": "Προσθήκη λογαριασμού Box",
"ButtonAddDropBox": "Προσθήκη λογαριασμού DropBox",
"ButtonAddGoogle": "Προσθήκη λογαριασμού Google",
"ButtonAddNextcloud": "Προσθήκη λογαριασμού Nextcloud",
"ButtonAddSkyDrive": "Προθήκη λογαριασμού OneDrive",
"NewDocument": "Νέο έγγραφο",
"NewFolder": "Νέος φάκελος",
"NewPresentation": "Νέα παρουσίαση",
"NewSpreadsheet": "Νέο υπολογιστικό φύλλο",
"UploadFiles": "Μεταφόρτωση αρχεία",
"UploadFolder": "Μεταφόρτωση φάκελο"
"UploadFolder": "Μεταφόρτωση φάκελο",
"Upload": "Μεταφόρτωση"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/el/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
8 changes: 7 additions & 1 deletion products/ASC.Files/Client/public/locales/es/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"ButtonAddBoxNet": "Añadir cuenta de Box",
"ButtonAddDropBox": "Añadir cuenta de Dropbox",
"ButtonAddGoogle": "Añadir cuenta de Google",
"ButtonAddNextcloud": "Añadir cuenta de Nextcloud",
"ButtonAddSkyDrive": "Añadir cuenta de OneDrive",
"NewDocument": "Nuevo documento",
"NewFolder": "Nueva carpeta",
"NewPresentation": "Nueva presentación",
"NewSpreadsheet": "Nueva hoja de cálculo",
"UploadFiles": "Cargar archivos",
"UploadFolder": "Cargar carpeta"
"UploadFolder": "Cargar carpeta",
"Upload": "Cargar"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/es/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
10 changes: 8 additions & 2 deletions products/ASC.Files/Client/public/locales/fi/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"ButtonAddBoxNet": "Liitä Box-tili",
"ButtonAddDropBox": "Liitä Dropbox-tili",
"ButtonAddGoogle": "Liitä Google-tili",
"ButtonAddNextcloud": "Liitä Nextcloud-tili",
"ButtonAddSkyDrive": "Liitä OneDrive-tili",
"NewDocument": "Uusi asiakirja",
"NewFolder": "Uusi kansio",
"NewPresentation": "Uusi esitys",
"NewSpreadsheet": "Uusi ",
"NewSpreadsheet": "Uusi",
"UploadFiles": "Lataa tiedostoja",
"UploadFolder": "Lataa kansio"
"UploadFolder": "Lataa kansio",
"Upload": "Lataa"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/fi/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
5 changes: 3 additions & 2 deletions products/ASC.Files/Client/public/locales/fr/Article.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"ButtonAddBoxNet": "Ajouter un compte Box",
"ButtonAddDropBox": "Ajouter un compte Dropbox",
"ButtonAddGoogle": "Ajouter un compte Google",
"ButtonAddNextcloud": "Ajouter un compte Nextcloud",
"ButtonAddNextcloud": "Ajouter un compte Nextcloud",
"ButtonAddSkyDrive": "Ajouter un compte OneDrive",
"NewDocument": "Nouveau document",
"NewFolder": "Nouveau dossier",
"NewPresentation": "Nouvelle présentation",
"NewSpreadsheet": "Nouvelle feuille de calcul",
"UploadFiles": "Télécharger les fichiers",
"UploadFolder": "Télécharger le dossier"
"UploadFolder": "Télécharger le dossier",
"Upload": "Télécharger"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/fr/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
5 changes: 3 additions & 2 deletions products/ASC.Files/Client/public/locales/it/Article.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"ButtonAddBoxNet": "Aggiungi account Box",
"ButtonAddDropBox": "Aggiungi account Dropbox",
"ButtonAddGoogle": "Aggiungi account Google",
"ButtonAddNextcloud": "Aggiungi un account Nextcloud",
"ButtonAddNextcloud": "Aggiungi account Nextcloud",
"ButtonAddSkyDrive": "Aggiungi account OneDrive",
"NewDocument": "Nuovo documento",
"NewFolder": "Nuova cartella",
"NewPresentation": "Nuova presentazione",
"NewSpreadsheet": "Nuovo foglio di calcolo elettronico",
"UploadFiles": "Caricamento file",
"UploadFolder": "Carica cartella"
"UploadFolder": "Carica cartella",
"Upload": "Carica"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/it/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
18 changes: 12 additions & 6 deletions products/ASC.Files/Client/public/locales/ja/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"NewDocument": "新しいドキュメント",
"NewFolder": "新しいフォルダ",
"NewPresentation": "新しいプレゼンテーション",
"NewSpreadsheet": "新しいスプレッドシート",
"UploadFiles": "ファイルのアップロード",
"UploadFolder": "フォルダのアップロード"
"ButtonAddBoxNet": "Boxアカウントを追加",
"ButtonAddDropBox": "Dropboxのアカウントを追加",
"ButtonAddGoogle": "Googleアカウントを追加",
"ButtonAddNextcloud": "Nextcloudアカウントを追加する",
"ButtonAddSkyDrive": "OneDriveのアカウントを追加",
"NewDocument": "新しいドキュメント",
"NewFolder": "新しいフォルダ",
"NewPresentation": "新しいプレゼンテーション",
"NewSpreadsheet": "新しいスプレッドシート",
"UploadFiles": "ファイルのアップロード",
"UploadFolder": "フォルダのアップロード",
"Upload": "アップロード"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/ja/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
8 changes: 7 additions & 1 deletion products/ASC.Files/Client/public/locales/ko/Article.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"ButtonAddBoxNet": "Box 계정을 추가",
"ButtonAddDropBox": "Dropbox 계정을 추가",
"ButtonAddGoogle": "Google 계정을 추가",
"ButtonAddNextcloud": "Nextcloud 계정을 추가",
"ButtonAddSkyDrive": "OneDrive 계정을 추가",
"NewDocument": "새 문서",
"NewFolder": "새 폴더",
"NewPresentation": "새 프레젠테이션",
"NewSpreadsheet": "새 스프레드시트",
"UploadFiles": "파일 업로드",
"UploadFolder": "폴더 업로드"
"UploadFolder": "폴더 업로드",
"Upload": "업로드"
}
3 changes: 3 additions & 0 deletions products/ASC.Files/Client/public/locales/ko/VersionBadge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"Version": "V.{{version}}"
}
Loading