diff --git a/client/src/app-components/ticket-list.js b/client/src/app-components/ticket-list.js
index f3ee3527..8722685b 100644
--- a/client/src/app-components/ticket-list.js
+++ b/client/src/app-components/ticket-list.js
@@ -226,7 +226,7 @@ class TicketList extends React.Component {
     }
 
     getTableRows() {
-        return this.getTickets().map(this.gerTicketTableObject.bind(this));
+        return this.getTickets().map(this.getTicketTableObject.bind(this));
     }
 
     getTickets() {
@@ -240,7 +240,7 @@ class TicketList extends React.Component {
         );
     }
 
-    gerTicketTableObject(ticket) {
+    getTicketTableObject(ticket) {
         const { date, title, ticketNumber, closed, tags, department, author } = ticket;
         const dateTodayWithOutHoursAndMinutes = DateTransformer.getDateToday();
         const ticketDateWithOutHoursAndMinutes = Math.floor(DateTransformer.UTCDateToLocalNumericDate(JSON.stringify(date*1)) / 10000);
@@ -248,7 +248,7 @@ class TicketList extends React.Component {
         const ticketDate = (
             ((dateTodayWithOutHoursAndMinutes - ticketDateWithOutHoursAndMinutes) > 1) ?
                 stringTicketLocalDateFormat :
-                `${(dateTodayWithOutHoursAndMinutes - ticketDateWithOutHoursAndMinutes) ? "Yesterday" : "Today"} at ${stringTicketLocalDateFormat.slice(-5)}`
+                `${(dateTodayWithOutHoursAndMinutes - ticketDateWithOutHoursAndMinutes) ? i18n("YESTERDAY_AT") : i18n("TODAY_AT")} ${stringTicketLocalDateFormat.slice(-5)}`
         );
         let titleText = (this.isTicketUnread(ticket)) ? title + ' (1)' : title;
 
diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js
index 140cb7ea..cc7e7c8b 100644
--- a/client/src/data/languages/en.js
+++ b/client/src/data/languages/en.js
@@ -445,6 +445,8 @@ export default {
 
     'TITLE_EDITED': '(title edited)',
     'COMMENT_EDITED': '(comment edited)',
+    'TODAY_AT': 'Today at',
+    'YESTERDAY_AT': 'Yesterday at',
     'LAST_7_DAYS': 'Last 7 days',
     'LAST_30_DAYS': 'Last 30 days',
     'LAST_90_DAYS': 'Last 90 days',
diff --git a/client/src/lib-core/date-transformer.js b/client/src/lib-core/date-transformer.js
index 31b43db5..9fa38209 100644
--- a/client/src/lib-core/date-transformer.js
+++ b/client/src/lib-core/date-transformer.js
@@ -1,7 +1,14 @@
 import moment from 'moment';
+import sessionStore from 'lib-app/session-store';
 
 const stringDateFormat = 'YYYYMMDDHHmm';
 const localUTCMins = new Date().getTimezoneOffset();
+let language = sessionStore.getConfigs().language;
+if (language == 'br') language = 'pt';
+if (language == 'cn') language = 'zh-cn';
+if (language == 'in') language = 'hi';
+if (language == 'jp') language = 'ja';
+if (language == 'gr') language = 'el';
 
 export default {
     stringDateToMoment(date) {
@@ -26,9 +33,9 @@ export default {
     },
     transformToString(date, expressive = true, retrunShortcutDate = false) {
         const momentDateLocal = this.stringDateToMoment(JSON.stringify(this.UTCDateToLocalNumericDate(date)));
-        if(expressive) momentDateLocal.format('D MMMM YYYY');
-        if(retrunShortcutDate) return momentDateLocal.format('D MMM YYYY, HH:mm');
-        return momentDateLocal.format('D MMMM YYYY, HH:mm');
+        if(expressive) momentDateLocal.locale(language).format('D MMMM YYYY');
+        if(retrunShortcutDate) return momentDateLocal.locale(language).format('D MMM YYYY, HH:mm');
+        return momentDateLocal.locale(language).format('D MMMM YYYY, HH:mm');
     },
     getDate(date) {
         return date < 10 ? `0${date}` : `${date}`;
diff --git a/server/models/Language.php b/server/models/Language.php
index dfad29ac..bd9ddcb5 100755
--- a/server/models/Language.php
+++ b/server/models/Language.php
@@ -12,11 +12,11 @@ class Language extends DataStore {
         'jp',
         'ru',
         'cn',
-        'in',
+        'in', 
         'tr',
         'it',
         'br',
-        'gr',
+        'gr', 
         'nl',
         'pl'
     ];