Selaa lähdekoodia

temporary fix for locale

Guénaël Muller 7 vuotta sitten
vanhempi
commit
151c45a1fa
2 muutettua tiedostoa jossa 9 lisäystä ja 3 poistoa
  1. 4 3
      tracim/models/data.py
  2. 5 0
      tracim/translation.py

+ 4 - 3
tracim/models/data.py Näytä tiedosto

29
 from depot.io.utils import FileIntent
29
 from depot.io.utils import FileIntent
30
 
30
 
31
 from tracim.translation import fake_translator as l_
31
 from tracim.translation import fake_translator as l_
32
+from tracim.translation import get_locale
32
 from tracim.exceptions import ContentRevisionUpdateError
33
 from tracim.exceptions import ContentRevisionUpdateError
33
 from tracim.models.meta import DeclarativeBase
34
 from tracim.models.meta import DeclarativeBase
34
 from tracim.models.auth import User
35
 from tracim.models.auth import User
1146
             delta_from_datetime = datetime.utcnow()
1147
             delta_from_datetime = datetime.utcnow()
1147
 
1148
 
1148
         return format_timedelta(delta_from_datetime - self.created,
1149
         return format_timedelta(delta_from_datetime - self.created,
1149
-                                locale=tg.i18n.get_lang()[0])
1150
+                                locale=get_locale())
1150
 
1151
 
1151
     def datetime_as_delta(self, datetime_object,
1152
     def datetime_as_delta(self, datetime_object,
1152
                           delta_from_datetime:datetime=None):
1153
                           delta_from_datetime:datetime=None):
1153
         if not delta_from_datetime:
1154
         if not delta_from_datetime:
1154
             delta_from_datetime = datetime.utcnow()
1155
             delta_from_datetime = datetime.utcnow()
1155
         return format_timedelta(delta_from_datetime - datetime_object,
1156
         return format_timedelta(delta_from_datetime - datetime_object,
1156
-                                locale=tg.i18n.get_lang()[0])
1157
+                                locale=get_locale())
1157
 
1158
 
1158
     def get_child_nb(self, content_type: ContentType, content_status = ''):
1159
     def get_child_nb(self, content_type: ContentType, content_status = ''):
1159
         child_nb = 0
1160
         child_nb = 0
1393
         if not delta_from_datetime:
1394
         if not delta_from_datetime:
1394
             delta_from_datetime = datetime.utcnow()
1395
             delta_from_datetime = datetime.utcnow()
1395
         return format_timedelta(delta_from_datetime - self.created,
1396
         return format_timedelta(delta_from_datetime - self.created,
1396
-                                locale=tg.i18n.get_lang()[0])
1397
+                                locale=get_locale())
1397
 
1398
 
1398
     def create_readable_date(self, delta_from_datetime:datetime=None):
1399
     def create_readable_date(self, delta_from_datetime:datetime=None):
1399
         aff = ''
1400
         aff = ''

+ 5 - 0
tracim/translation.py Näytä tiedosto

1
+from babel.core import default_locale
1
 
2
 
2
 
3
 
3
 def fake_translator(text: str):
4
 def fake_translator(text: str):
4
     # TODO - G.M - 27-03-2018 - [i18n] Reconnect true internationalization
5
     # TODO - G.M - 27-03-2018 - [i18n] Reconnect true internationalization
5
     return text
6
     return text
7
+
8
+def get_locale():
9
+    # TODO - G.M - 27-03-2018 - [i18n] Reconnect true internationalization
10
+    return default_locale('LC_TIME')