mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-31 21:41:33 +00:00
Fixing Cyrillic text issue by both using encoded text from server with the help of requests, and then serving it with a defined charset encoding back to the client.
This commit is contained in:
parent
f49f5ebc04
commit
f30b35acd1
3 changed files with 3 additions and 3 deletions
|
@ -442,7 +442,7 @@ def load_feed_page(request, feed_id):
|
||||||
if not data:
|
if not data:
|
||||||
data = "Fetching feed..."
|
data = "Fetching feed..."
|
||||||
|
|
||||||
return HttpResponse(data, mimetype='text/html')
|
return HttpResponse(data, mimetype="text/html; charset=utf-8")
|
||||||
|
|
||||||
@json.json_view
|
@json.json_view
|
||||||
def load_starred_stories(request):
|
def load_starred_stories(request):
|
||||||
|
|
|
@ -1201,7 +1201,7 @@ class MFeedPage(mongo.Document):
|
||||||
feed_page = MFeedPage.objects.filter(feed_id=feed.pk)
|
feed_page = MFeedPage.objects.filter(feed_id=feed.pk)
|
||||||
if feed_page:
|
if feed_page:
|
||||||
data = feed_page[0].page_data and zlib.decompress(feed_page[0].page_data)
|
data = feed_page[0].page_data and zlib.decompress(feed_page[0].page_data)
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
class MStory(mongo.Document):
|
class MStory(mongo.Document):
|
||||||
|
|
|
@ -58,7 +58,7 @@ class PageImporter(object):
|
||||||
data = response.read()
|
data = response.read()
|
||||||
else:
|
else:
|
||||||
response = requests.get(feed_link, headers=self.headers)
|
response = requests.get(feed_link, headers=self.headers)
|
||||||
data = response.content
|
data = response.text
|
||||||
elif any(feed_link.startswith(s) for s in BROKEN_PAGES):
|
elif any(feed_link.startswith(s) for s in BROKEN_PAGES):
|
||||||
self.save_no_page()
|
self.save_no_page()
|
||||||
return
|
return
|
||||||
|
|
Loading…
Add table
Reference in a new issue