From 1ad972d30cb4528ef765bb5b12e75a00a7555a99 Mon Sep 17 00:00:00 2001 From: Simon Konrad <simon.konrad@mni.thm.de> Date: Wed, 30 Jun 2021 17:15:25 +0200 Subject: [PATCH] Make weight rotation for all elements instead of some Weight rotation is now applied to all elements of a relevance-class instead of some. + translation fixes [Ticket: #172] --- src/app/components/shared/tag-cloud/tag-cloud.component.ts | 2 +- src/assets/i18n/creator/de.json | 4 ++-- src/assets/i18n/creator/en.json | 5 ++--- src/assets/i18n/participant/de.json | 6 +++--- src/assets/i18n/participant/en.json | 7 +++---- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.ts b/src/app/components/shared/tag-cloud/tag-cloud.component.ts index 6f77a89b4..ce718717b 100644 --- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts +++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts @@ -368,7 +368,7 @@ export class TagCloudComponent implements OnInit, OnDestroy, AfterContentInit, A if (remaining > 0) { --countFiler[tagData.adjustedWeight]; } - let rotation = Math.random() < 0.5 ? this._currentSettings.cloudWeightSettings[tagData.adjustedWeight].rotation : 0; + let rotation = this._currentSettings.cloudWeightSettings[tagData.adjustedWeight].rotation; if (rotation === null || this._currentSettings.randomAngles) { rotation = Math.floor(Math.random() * 30 - 15); } diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json index 730263712..d8b66258d 100644 --- a/src/assets/i18n/creator/de.json +++ b/src/assets/i18n/creator/de.json @@ -492,8 +492,8 @@ "notation-tooltip": "Einstellung der Schreibweise: klein, groß, wie eingeben", "alphabetical-sorting-tooltip": "Alphabetische Sortierung", "highestWeight-tooltip": "x Tags mit der höchsten Gewichtung anzeigen", - "rotate-weight": "Einträge dieser Relevanz-Gruppe zufällig um x Grad drehen", - "rotate-weight-tooltip": "Einträge dieser Relevanz-Gruppe zufällig um x Grad drehen", + "rotate-weight": "Alle Einträge dieser Gruppe um x Grad drehen", + "rotate-weight-tooltip": "Alle Einträge dieser Gruppe um x Grad drehen", "font":"Schrift", "reset-btn": "Zurücksetzten", "font-family-tooltip": "Schriftart auswählen", diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json index cbf7e86d6..26f8acf5d 100644 --- a/src/assets/i18n/creator/en.json +++ b/src/assets/i18n/creator/en.json @@ -490,15 +490,14 @@ "highestWeight": "Number of tags with highest weight", "notation-tooltip": "Notation-Settings: small, large, standard", "alphabetical-sorting-tooltip": "Alphabetical sorting", - "rotate-weight-tooltip": "Rotate some entries randomly by x degrees", "highestWeight-tooltip": "show x tags with the highest weight", - "rotate-weight": "Rotate some entries of this weight class randomly by x degrees", + "rotate-weight": "Rotate all entries of this class by x degrees", + "rotate-weight-tooltip": "Rotate all entries of this class by x degrees", "font":"Font", "reset-btn": "Reset", "font-family-tooltip": "Select font", "bold-notation-tooltip": "Select font-thickness bold", "font-style-bold" : "Bold", - "font-style-italic": "Italic", "font-family":"Font Family", "manual-weight-number": "Set quantity", "manual-weight-number-tooltip": "Quantity Limitation of this weight class", diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json index ef8cb6546..1437aef39 100644 --- a/src/assets/i18n/participant/de.json +++ b/src/assets/i18n/participant/de.json @@ -341,9 +341,9 @@ "hover-time-tooltip": "Festlegen der Erscheinungszeit der Wörter", "hover-delay-tooltip": "Hover-Verzögerung der Wörter", "extended-btn": "Relevanz-Gruppen", - "back-btn": "Zurück", "weight-class-settings": "Relevanz", "weight-class": "Relevanz-Gruppe", + "back-btn": "Zurück", "weight-color": "Schriftfarbe", "weight-number": "max. Anzahl Stichwörter", "weight-color-tooltip": "Auswahl der Schriftfarbe", @@ -360,8 +360,8 @@ "notation-tooltip": "Einstellung der Schreibweise: klein, groß, wie vorgegeben", "alphabetical-sorting-tooltip": "Alphabetische Sortierung", "highestWeight-tooltip": "x Tags mit der höchsten Gewichtung anzeigen", - "rotate-weight": "Einträge dieser Relevanz-Gruppe zufällig um x Grad drehen", - "rotate-weight-tooltip": "Einträge dieser Relevanz-Gruppe zufällig um x Grad drehen", + "rotate-weight": "Alle Einträge dieser Gruppe um x Grad drehen", + "rotate-weight-tooltip": "Alle Einträge dieser Gruppe um x Grad drehen", "font":"Schrift", "reset-btn": "Zurücksetzten", "font-family-tooltip": "Schrift auswählen", diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json index dbc6ad3a1..a07e52aa2 100644 --- a/src/assets/i18n/participant/en.json +++ b/src/assets/i18n/participant/en.json @@ -365,15 +365,14 @@ "highestWeight": "Number of tags with highest weight", "notation-tooltip": "Notation-Settings: small, large, standard", "alphabetical-sorting-tooltip": "Alphabetical sorting", - "rotate-weight-tooltip": "Rotate some entries randomly by x degrees", - "highestWeight-tooltip": "show x tags with the highest weight", - "rotate-weight": "Rotate some entries of this weight class randomly by x degrees", + "highestWeight-tooltip": "Show x tags with the highest weight", + "rotate-weight": "Rotate all entries of this class by x degrees", + "rotate-weight-tooltip": "Rotate all entries of this class by x degrees", "font":"Font", "reset-btn": "Reset", "font-family-tooltip": "Select font", "bold-notation-tooltip": "Select font-thickness bold", "font-style-bold" : "Bold", - "font-style-italic": "Italic", "font-family":"Font Family", "manual-weight-number": "Set quantity", "manual-weight-number-tooltip": "Quantity Limitation of this weight class", -- GitLab