merge request id	713
Titel	Feature/ll 1308 change localization
Beschreibung	First branch
Status	merged
Created at	2022-12-06T14:03:50.469Z
Updated at	2022-12-08T12:58:19.738Z
Source branch	feature/LL-1308-change-localization
Target branch	develop
Author	Sascha Immig
Assignee	Sascha Immig

Discussion notes

added 2 commits 8353f978 - LL-1308: Internationalisierung des Benutzersprofil. 168535d2 - Merge branch 'feature/LL-1308-change-localization' of… Compare with previous version	Richard Klings	2022-12-06T14:37:21.776Z
added 1 commit bbe1aa0a - LL-1308: Kleine Anpassung Compare with previous version	Richard Klings	2022-12-06T14:43:23.089Z
added 4 commits 3de8dd8c - optimized new translations for training status ans assignment status (in charts) f5ccbbcf - fixed some translations a79537ff - Merge branch 'feature/LL-1308-change-localization' of… 57b7bcf8 - more occurences of training status replaced Compare with previous version	Sascha Immig	2022-12-06T17:16:39.899Z
added 3 commits 44543192 - replaced with proper english translations (was copy and paste from de) 42eb19c3 - removed duplicates d71647be - moved onboarding and contentblocks from base to cms Compare with previous version	Sascha Immig	2022-12-07T08:55:06.030Z
added 8 commits 2bb8f951 - added fullname to users and corrected some translations 5802393c - moved hero block to cms 0ab87bc7 - moved page / pages to cms 5e6824cd - changed users.position* to object notation 8e6451a6 - added TODO comment 7c04d93e - renamed 'good_day' to 'salute' 0d05d15b - used correct "expires" translations (was pages instead of trainings) 5d2c71c8 - updated messages.js Compare with previous version	Sascha Immig	2022-12-07T10:35:00.094Z
added 1 commit 4ce9b6c8 - added TODO comment [skip-ci] Compare with previous version	Sascha Immig	2022-12-08T12:37:40.584Z
merged	Sascha Immig	2022-12-08T12:58:19.783Z

Merge Commits

Title	Id	Author	Created at	Message
moved page / pages to cms	0ab87bc7f3ea86e059fa0b57b4a46c1142d9622c	TUV\immigs	2022-12-07T09:55:00.000Z	moved page / pages to cms
used correct "expires" translations (was pages instead of trainings)	0d05d15ba88f4fdf3b42ca3cb5d09a539434a70c	TUV\immigs	2022-12-07T10:30:16.000Z	used correct "expires" translations (was pages instead of trainings)
Merge branch 'feature/LL-1308-change-localization' of…	168535d2e566ba46823cfc75478f9cb91112e9ac	Richard Klings	2022-12-06T14:36:54.000Z	Merge branch 'feature/LL-1308-change-localization' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1308-change-localization # Conflicts: # app/Http/Controllers/Admin/EmployeeTrainingStatusReportController.php # resources/lang/de.json # resources/lang/de/base.php # resources/lang/de/validation.php # resources/lang/en/base.php # resources/views/admin/organizationUnits/orders/table.blade.php
added fullname to users and corrected some translations	2bb8f95196254de48a86248593d6214451cdab58	TUV\immigs	2022-12-07T09:44:32.000Z	added fullname to users and corrected some translations
optimized new translations for training status ans assignment status (in charts)	3de8dd8cee705ecabc3a22545cfe8da2098d7b72	TUV\immigs	2022-12-06T16:53:42.000Z	optimized new translations for training status ans assignment status (in charts)
removed duplicates	42eb19c31fc9a8e5470aa064baee54a27019ed5f	TUV\immigs	2022-12-07T08:44:33.000Z	removed duplicates
replaced with proper english translations (was copy and paste from de)	44543192df5cca61e9d8c52535239e6643a89e5e	TUV\immigs	2022-12-06T17:19:14.000Z	replaced with proper english translations (was copy and paste from de)
added TODO comment [skip-ci]	4ce9b6c8d0583e9b461213ab87ab4513c33b6923	TUV\immigs	2022-12-07T13:10:46.000Z	added TODO comment [skip-ci]
more occurences of training status replaced	57b7bcf868391b0b084f0600b2d5358cd3a10b7e	TUV\immigs	2022-12-06T17:16:23.000Z	more occurences of training status replaced
moved hero block to cms	5802393c9ee38b13ef02c8c590de4b2ea2f2989d	TUV\immigs	2022-12-07T09:49:12.000Z	moved hero block to cms
updated messages.js	5d2c71c8d983b17faede085fb784d9ad0841d3d1	TUV\immigs	2022-12-07T10:34:31.000Z	updated messages.js
changed users.position* to object notation	5e6824cd5f9a8e25a29f397bc1d4cb7e15bbbfd7	TUV\immigs	2022-12-07T10:06:17.000Z	changed users.position* to object notation
renamed 'good_day' to 'salute'	7c04d93e5093580ebfd30196a8d8804eadc296f3	TUV\immigs	2022-12-07T10:29:45.000Z	renamed 'good_day' to 'salute'
LL-1308: Internationalisierung des Benutzersprofil.	8353f978a2d5132a9e50c3b364331942c30ad4fc	Richard Klings	2022-12-06T14:29:41.000Z	LL-1308: Internationalisierung des Benutzersprofil.
added TODO comment	8e6451a6ccff5a28be067df279e943aca2abaa91	TUV\immigs	2022-12-07T10:06:31.000Z	added TODO comment
Merge branch 'feature/LL-1308-change-localization' of…	a79537ffec1e1aadbb8e71fd4b37e7637162919a	TUV\immigs	2022-12-06T16:57:19.000Z	Merge branch 'feature/LL-1308-change-localization' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1308-change-localization # Conflicts: # resources/lang/de.json # resources/lang/en/users.php
LL-1308: Kleine Anpassung	bbe1aa0a2522013d19cc8719ddd70c0dcd2bed2e	Richard Klings	2022-12-06T14:42:46.000Z	LL-1308: Kleine Anpassung
moved onboarding and contentblocks from base to cms	d71647bed7c552dde331aec4f01672739e042424	TUV\immigs	2022-12-07T08:54:50.000Z	moved onboarding and contentblocks from base to cms
reworked localization for	e78ea7f5ee8d8fd4e4f84c2eff092003bf18d2ee	gerlachm	2022-12-02T17:19:15.000Z	reworked localization for contentBlocks, reminderTemplates, faq, heroBlock, media, menus, links, onboardingBlocks, pages with Base
fixed some translations	f5ccbbcfa13e176ea396b1db4acfc7d387f99ed9	TUV\immigs	2022-12-06T16:53:56.000Z	fixed some translations