fixes in desplaying news and in transaltions

hpi-schul-cloud · Feb 2, 2024 · 2a5e216 · 2a5e216
1 parent e7c0cc5
commit 2a5e216
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/locales/de.json b/locales/de.json
@@ -2649,11 +2649,10 @@
 			"atYourSchool": "an deiner Schule ",
 			"created": "erstellt",
 			"by": "von ",
-			"closingBracket": ")",
 			"inTheClass": "in der Klasse",
 			"inTheCourse": "im Kurs",
 			"inTheTeam": "im Team",
-			"last": "(zuletzt",
+			"last": "zuletzt",
 			"newsNeedContent": "News benötigen Inhalt!",
 			"newsNeedTitle": "News benötigen einen Titel!",
 			"processed": "bearbeitet",

diff --git a/locales/en.json b/locales/en.json
@@ -2648,12 +2648,11 @@
 			"atSchool": "at school",
 			"atYourSchool": "at your school ",
 			"by": "by ",
-			"closingBracket": ")",
 			"created": "created",
 			"inTheClass": "in the class",
 			"inTheCourse": "in the course",
 			"inTheTeam": "in the team",
-			"last": "(last",
+			"last": "last",
 			"newsNeedContent": "News need content!",
 			"newsNeedTitle": "News need a title!",
 			"processed": "edited",

diff --git a/locales/es.json b/locales/es.json
@@ -2649,11 +2649,10 @@
 			"atYourSchool": "en tu escuela",
 			"created": "creado",
 			"by": "por ",
-			"closingBracket": ")",
 			"inTheClass": "en la clase",
 			"inTheCourse": "en el curso",
 			"inTheTeam": "en el equipo",
-			"last": "(últimamente",
+			"last": "últimamente",
 			"newsNeedContent": "¡Las noticias necesitan contenido!",
 			"newsNeedTitle": "¡Las noticias necesitan un título!",
 			"processed": "editado",

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

diff --git a/views/news/article.hbs b/views/news/article.hbs
@@ -1,16 +1,15 @@
 {{#extend "news/news"}}
 {{#content "page"}}
 <p>
-    <small class="text-muted">{{$t "news.text.created" }}</small>
     {{#unless isRSS}}
     <small class="text-muted">
+        {{#if news.updater}}
+        {{$t "news.text.last" }} {{$t "news.text.processed" }} {{$t "news.text.by" }}{{news.updater.firstName}} {{news.updater.lastName}} {{timeFromNow news.updatedAt}} |
+        {{/if}}
         {{#if news.creator}}
-        {{$t "news.text.by" }}{{news.creator.firstName}} {{news.creator.lastName}}
+        {{$t "news.text.created" }} {{$t "news.text.by" }}{{news.creator.firstName}} {{news.creator.lastName}}
         {{/if}}
         {{timeFromNow news.displayAt}}
-        {{#if news.updater}}
-        {{$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'}}
         {{$t "news.text.inTheTeam" }}
@@ -25,8 +24,8 @@
  <a href="/{{../news.targetModel}}/{{../news.target.id}}">{{../news.target.name}}</a>
         {{/ifCond}}
         {{/if}}
-        {{#ifCond @root.currentUser.schoolId '===' news.school.id}} {{$t "news.text.atYourSchool" }}{{else}}
-        {{$t "news.text.atSchool" }} {{../news.school.name}}
+        </br>
+        {{#ifCond @root.currentUser.schoolId '!==' news.school.id}} {{$t "news.text.atSchool" }} {{../news.school.name}}
         {{/ifCond}}
     </small>
     {{/unless}}