diff --git a/app/Http/Controllers/Api/LanguageController.php b/app/Http/Controllers/Api/LanguageController.php
index bbb77dc4..f95c5397 100644
--- a/app/Http/Controllers/Api/LanguageController.php
+++ b/app/Http/Controllers/Api/LanguageController.php
@@ -43,9 +43,9 @@ class LanguageController extends Controller
                              return $language;
                          })
                          ->toArray();
-        foreach ($array as &$item) {
-            //$item['translated'] = __($item['name']);
-            $item['description'] = $item['language'] === 'en'
+        foreach ($array as $key => $item) {
+            $array[$key]['name'] =  empty($item['name']) ? $item['language'] : $item['name'];
+            $array[$key]['description'] = $item['language'] === 'en'
                 ? '100% translated'
                 : round($item['translatedCount'] / $item['toTranslate'] * 100).'% translated';
         }
diff --git a/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php b/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php
index a91203d2..06ad0825 100644
--- a/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php
+++ b/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php
@@ -7,10 +7,14 @@
             <div class="flex items-start">
                 <div class="w-full sm:w-1/2">
 
+                    @php
+                        $locale = \Illuminate\Support\Facades\Cookie::get('lang', 'de');
+                    @endphp
+
                     <link rel="stylesheet" type="text/css"
                           href="https://unpkg.com/js-year-calendar@latest/dist/js-year-calendar.min.css"/>
                     <script src="https://unpkg.com/js-year-calendar@latest/dist/js-year-calendar.min.js"></script>
-                    <script src="https://unpkg.com/js-year-calendar@latest/locales/js-year-calendar.de.js"></script>
+                    <script src="https://unpkg.com/js-year-calendar@latest/locales/js-year-calendar.{{ $locale }}.js"></script>
 
                     <style>
                         .calendar .calendar-header {
@@ -48,7 +52,7 @@
 
                             new Calendar(this.$refs.calendar, {
                                 style: 'background',
-                                language: 'de',
+                                language: '{{ $locale }}',
                                 startYear: {{ $year }},
                                 dataSource: events,
                                 yearChanged: function(e) {
diff --git a/resources/views/livewire/meetup/meetup-event-table.blade.php b/resources/views/livewire/meetup/meetup-event-table.blade.php
index 4e6f3b6d..cebece5a 100644
--- a/resources/views/livewire/meetup/meetup-event-table.blade.php
+++ b/resources/views/livewire/meetup/meetup-event-table.blade.php
@@ -7,10 +7,14 @@
             <div class="flex items-start">
                 <div class="w-full sm:w-1/2">
 
+                    @php
+                        $locale = \Illuminate\Support\Facades\Cookie::get('lang', 'de');
+                    @endphp
+
                     <link rel="stylesheet" type="text/css"
                           href="https://unpkg.com/js-year-calendar@latest/dist/js-year-calendar.min.css"/>
                     <script src="https://unpkg.com/js-year-calendar@latest/dist/js-year-calendar.min.js"></script>
-                    <script src="https://unpkg.com/js-year-calendar@latest/locales/js-year-calendar.de.js"></script>
+                    <script src="https://unpkg.com/js-year-calendar@latest/locales/js-year-calendar.{{ $locale }}.js"></script>
 
                     <style>
                         .calendar .calendar-header {
@@ -35,7 +39,6 @@
                             background: #222;
                         }
                     </style>
-
                     <div
                         wire:ignore
                         x-data="{
@@ -48,7 +51,7 @@
 
                             new Calendar(this.$refs.calendar, {
                                 style: 'background',
-                                language: 'de',
+                                language: '{{ $locale }}',
                                 startYear: {{ $year }},
                                 dataSource: events,
                                 yearChanged: function(e) {
diff --git a/resources/views/livewire/school/event-table.blade.php b/resources/views/livewire/school/event-table.blade.php
index 56301351..ecdffbed 100644
--- a/resources/views/livewire/school/event-table.blade.php
+++ b/resources/views/livewire/school/event-table.blade.php
@@ -7,10 +7,14 @@
             <div class="flex items-start">
                 <div class="w-full sm:w-1/2">
 
+                    @php
+                        $locale = \Illuminate\Support\Facades\Cookie::get('lang', 'de');
+                    @endphp
+
                     <link rel="stylesheet" type="text/css"
                           href="https://unpkg.com/js-year-calendar@latest/dist/js-year-calendar.min.css"/>
                     <script src="https://unpkg.com/js-year-calendar@latest/dist/js-year-calendar.min.js"></script>
-                    <script src="https://unpkg.com/js-year-calendar@latest/locales/js-year-calendar.de.js"></script>
+                    <script src="https://unpkg.com/js-year-calendar@latest/locales/js-year-calendar.{{ $locale }}.js"></script>
 
                     <style>
                         .calendar .calendar-header {
@@ -48,7 +52,7 @@
 
                             new Calendar(this.$refs.calendar, {
                                 style: 'background',
-                                language: 'de',
+                                language: '{{ $locale }}',
                                 startYear: {{ $year }},
                                 dataSource: events,
                                 yearChanged: function(e) {