Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2972 (Problem with Accented characters in recipe_publico.py)

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-28 10:31:10 -06:00
parent 4def7e4f9b
commit c129efbb00
6 changed files with 181 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/main.py
View File

@ -418,8 +418,10 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
try: try:
db = LibraryDatabase2(self.library_path) db = LibraryDatabase2(self.library_path)
except Exception, err: except Exception, err:
import traceback
error_dialog(self, _('Bad database location'), error_dialog(self, _('Bad database location'),
unicode(err)).exec_() _('Bad database location')+':'+self.library_path,
det_msg=traceback.format_exc()).exec_()
dir = unicode(QFileDialog.getExistingDirectory(self, dir = unicode(QFileDialog.getExistingDirectory(self,
_('Choose a location for your ebook library.'), _('Choose a location for your ebook library.'),
os.path.expanduser('~'))) os.path.expanduser('~')))

4
src/calibre/trac/plugins/templates/linux.html
View File

@ -91,6 +91,10 @@ sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.
You must have xdg-utils installed You must have xdg-utils installed
on your system before running the installer. on your system before running the installer.
</li> </li>
<li>
For device automounting to work, you must have the pmount
package installed on your system.
</li>
<li> <li>
On a 64bit machine, you must have 32-bit versions On a 64bit machine, you must have 32-bit versions
of common libraries like X11, freetype, fontconfig, of common libraries like X11, freetype, fontconfig,

4
src/calibre/web/feeds/recipes/recipe_estadao.py
View File

@ -11,7 +11,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
class Estadao(BasicNewsRecipe): class Estadao(BasicNewsRecipe):
title = 'O Estado de S. Paulo' title = 'O Estado de S. Paulo'
__author__ = 'Darko Miletic' __author__ = 'Darko Miletic'
description = 'News from Brasil in Portugese' description = 'News from Brasil in Portuguese'
publisher = 'O Estado de S. Paulo' publisher = 'O Estado de S. Paulo'
category = 'news, politics, Brasil' category = 'news, politics, Brasil'
oldest_article = 2 oldest_article = 2
@ -59,4 +59,4 @@ class Estadao(BasicNewsRecipe):
del item['style'] del item['style']
return soup return soup
language = _('Portugese') language = _('Portuguese')

2
src/calibre/web/feeds/recipes/recipe_jb_online.py
View File

@ -44,4 +44,4 @@ class JBOnline(BasicNewsRecipe):
del item['style'] del item['style']
return soup return soup
language = _('Portugese') language = _('Portuguese')

2
src/calibre/web/feeds/recipes/recipe_o_globo.py
View File

@ -66,4 +66,4 @@ class OGlobo(BasicNewsRecipe):
del item['style'] del item['style']
return soup return soup
language = _('Portugese') language = _('Portuguese')

10
src/calibre/web/feeds/recipes/recipe_publico.py
View File

@ -11,23 +11,23 @@ from calibre.web.feeds.news import BasicNewsRecipe
import re import re
class Publico(BasicNewsRecipe): class Publico(BasicNewsRecipe):
title = u'P\xc3\xbablico' title = u'P\xfablico'
__author__ = 'David Rodrigues' __author__ = 'David Rodrigues'
oldest_article = 1 oldest_article = 1
max_articles_per_feed = 30 max_articles_per_feed = 30
encoding='utf-8' encoding='utf-8'
no_stylesheets = True no_stylesheets = True
language = _('Portugese') language = _('Portuguese')
preprocess_regexps = [(re.compile(u"\uFFFD", re.DOTALL|re.IGNORECASE), lambda match: ''),] preprocess_regexps = [(re.compile(u"\uFFFD", re.DOTALL|re.IGNORECASE), lambda match: ''),]
feeds = [ feeds = [
(u'Geral', u'http://feeds.feedburner.com/PublicoUltimaHora'), (u'Geral', u'http://feeds.feedburner.com/PublicoUltimaHora'),
(u'Internacional', u'http://www.publico.clix.pt/rss.ashx?idCanal=11'), (u'Internacional', u'http://www.publico.clix.pt/rss.ashx?idCanal=11'),
(u'Pol\xc3\xadtica', u'http://www.publico.clix.pt/rss.ashx?idCanal=12'), (u'Pol\xedtica', u'http://www.publico.clix.pt/rss.ashx?idCanal=12'),
(u'Ci\xc3\xaancias', u'http://www.publico.clix.pt/rss.ashx?idCanal=13'), (u'Ci\xcencias', u'http://www.publico.clix.pt/rss.ashx?idCanal=13'),
(u'Desporto', u'http://desporto.publico.pt/rss.ashx'), (u'Desporto', u'http://desporto.publico.pt/rss.ashx'),
(u'Economia', u'http://www.publico.clix.pt/rss.ashx?idCanal=57'), (u'Economia', u'http://www.publico.clix.pt/rss.ashx?idCanal=57'),
(u'Educa\xc3\xa7\xc3\xa3o', u'http://www.publico.clix.pt/rss.ashx?idCanal=58'), (u'Educa\xe7\xe3o', u'http://www.publico.clix.pt/rss.ashx?idCanal=58'),
(u'Local', u'http://www.publico.clix.pt/rss.ashx?idCanal=59'), (u'Local', u'http://www.publico.clix.pt/rss.ashx?idCanal=59'),
(u'Media e Tecnologia', u'http://www.publico.clix.pt/rss.ashx?idCanal=61'), (u'Media e Tecnologia', u'http://www.publico.clix.pt/rss.ashx?idCanal=61'),
(u'Sociedade', u'http://www.publico.clix.pt/rss.ashx?idCanal=62') (u'Sociedade', u'http://www.publico.clix.pt/rss.ashx?idCanal=62')