Kaynağa Gözat

Merge pull request #486 from tracim/fix/485/utf8_pages_threads_webdav

Damien Accorsi 7 yıl önce
ebeveyn
işleme
96f6836867
No account linked to committer's email
1 değiştirilmiş dosya ile 6 ekleme ve 4 silme
  1. 6 4
      tracim/tracim/lib/webdav/design.py

+ 6 - 4
tracim/tracim/lib/webdav/design.py Dosyayı Görüntüle

@@ -173,9 +173,10 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
173 173
                    )
174 174
     histHTML += '</table>'
175 175
 
176
-    file = '''
176
+    page = '''
177 177
 <html>
178 178
 <head>
179
+	<meta charset="utf-8" />
179 180
 	<title>%s</title>
180 181
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
181 182
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
@@ -233,7 +234,7 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
233 234
                content_revision.description,
234 235
                histHTML)
235 236
 
236
-    return file
237
+    return page
237 238
 
238 239
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
239 240
         hist = content.get_history()
@@ -291,9 +292,10 @@ def designThread(content: data.Content, content_revision: data.ContentRevisionRO
291 292
                                # t.ref_object.label) if t.type.id in ['revision', 'creation', 'edition'] else '')
292 293
                            )
293 294
 
294
-        page = '''
295
+        thread = '''
295 296
 <html>
296 297
 <head>
298
+	<meta charset="utf-8" />
297 299
 	<title>%s</title>
298 300
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
299 301
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
@@ -379,4 +381,4 @@ def designThread(content: data.Content, content_revision: data.ContentRevisionRO
379 381
                content_revision.description,
380 382
                disc)
381 383
 
382
-        return page
384
+        return thread