Merge branch 'BC-6424-correct-message-in-news' into BC-5836-and-BC-6424…

…-news-testing
hpi-schul-cloud · Feb 2, 2024 · 8a05f76 · 8a05f76
2 parents f683d69 + e7c0cc5
commit 8a05f76
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/locales/de.json b/locales/de.json
@@ -2648,14 +2648,15 @@
 			"atSchool": "an der Schule",
 			"atYourSchool": "an deiner Schule ",
 			"created": "erstellt",
-			"from": "von",
+			"by": "von ",
+			"closingBracket": ")",
 			"inTheClass": "in der Klasse",
 			"inTheCourse": "im Kurs",
 			"inTheTeam": "im Team",
-			"lastFrom": "(zuletzt von",
+			"last": "(zuletzt",
 			"newsNeedContent": "News benötigen Inhalt!",
 			"newsNeedTitle": "News benötigen einen Titel!",
-			"processed": "bearbeitet)",
+			"processed": "bearbeitet",
 			"released": "Veröffentlicht",
 			"unpublished": "Unveröffentlicht"
 		}

diff --git a/locales/en.json b/locales/en.json
@@ -2647,15 +2647,16 @@
 		"text": {
 			"atSchool": "at school",
 			"atYourSchool": "at your school ",
+			"by": "by ",
+			"closingBracket": ")",
 			"created": "created",
-			"from": "from",
 			"inTheClass": "in the class",
 			"inTheCourse": "in the course",
 			"inTheTeam": "in the team",
-			"lastFrom": "(last from",
+			"last": "(last",
 			"newsNeedContent": "News need content!",
 			"newsNeedTitle": "News need a title!",
-			"processed": "edited)",
+			"processed": "edited",
 			"released": "Released",
 			"unpublished": "Unpublished"
 		}

diff --git a/locales/es.json b/locales/es.json
@@ -2648,14 +2648,15 @@
 			"atSchool": "en la escuela",
 			"atYourSchool": "en tu escuela",
 			"created": "creado",
-			"from": "desde",
+			"by": "por ",
+			"closingBracket": ")",
 			"inTheClass": "en la clase",
 			"inTheCourse": "en el curso",
 			"inTheTeam": "en el equipo",
-			"lastFrom": "(último desde",
+			"last": "(últimamente",
 			"newsNeedContent": "¡Las noticias necesitan contenido!",
 			"newsNeedTitle": "¡Las noticias necesitan un título!",
-			"processed": "editado)",
+			"processed": "editado",
 			"released": "Publicado",
 			"unpublished": "Sin publicar"
 		}

diff --git a/locales/uk.json b/locales/uk.json
@@ -1677,12 +1677,13 @@
 			"atSchool": "у школі",
 			"atYourSchool": "у вашій школі ",
 			"created": "створено",
-			"from": "з",
+			"by": "",
+			"closingBracket": ")",
 			"inTheClass": "в класі",
 			"inTheCourse": "в курсі",
 			"inTheTeam": "в команді",
-			"lastFrom": "(останнє з",
-			"processed": "відредаговано)",
+			"last": "(останній раз було",
+			"processed": "відредаговано",
 			"released": "Випущено",
 			"unpublished": "Не опубліковано",
 			"newsNeedContent": "Новинам потрібний контент!",

diff --git a/views/news/article.hbs b/views/news/article.hbs
@@ -1,12 +1,15 @@
 {{#extend "news/news"}}
 {{#content "page"}}
 <p>
-    <small class="text-muted">{{timeFromNow news.displayAt}}</small>
+    <small class="text-muted">{{$t "news.text.created" }}</small>
     {{#unless isRSS}}
     <small class="text-muted">
-        {{$t "news.text.from" }} {{news.creator.firstName}} {{news.creator.lastName}} {{$t "news.text.created" }}
+        {{#if news.creator}}
+        {{$t "news.text.by" }}{{news.creator.firstName}} {{news.creator.lastName}}
+        {{/if}}
+        {{timeFromNow news.displayAt}}
         {{#if news.updater}}
-        {{$t "news.text.lastFrom" }} {{news.updater.firstName}} {{news.updater.lastName}} {{$t "news.text.processed" }}
+        {{$t "news.text.last" }} {{$t "news.text.processed" }} {{$t "news.text.by" }}{{news.updater.firstName}} {{news.updater.lastName}}{{$t "news.text.closingBracket" }}
         {{/if}}
         {{#if news.target.name}}
         {{#ifCond news.targetModel '===' 'teams'}}