gajim: [Aлекс]. Fix time string encoding in the russian windows(...

[Fomin Denis]

changeset e0de4f6d0d18 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=e0de4f6d0d18
description: [Aлекс]. Fix time string encoding in the russian windows(cp1251).

diffstat:

 src/conversation_textview.py |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r d3368ce04285 -r e0de4f6d0d18 src/conversation_textview.py
--- a/src/conversation_textview.py  Mon Oct 29 15:11:16 2012 +0100
+++ b/src/conversation_textview.py  Mon Sep 03 22:02:07 2012 +0400
@@ -1334,7 +1334,7 @@
 timestamp_str = helpers.from_one_line(timestamp_str)
 format_ += timestamp_str
 tim_format = time.strftime(format_, tim)
-if locale.getpreferredencoding() != 'KOI8-R':
+if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'):
 # if tim_format comes as unicode because of day_str.
 # we convert it to the encoding that we want (and that is utf-8)
 tim_format = helpers.ensure_utf8_string(tim_format)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: [Aлекс]. Fix time string encoding in the russian windows(...

[Fomin Denis]

changeset c1103a8737dc in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=c1103a8737dc
description: [Aлекс]. Fix time string encoding in the russian windows(cp1251).

diffstat:

 src/conversation_textview.py |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 4d141800e2e6 -r c1103a8737dc src/conversation_textview.py
--- a/src/conversation_textview.py  Sun Sep 02 12:59:55 2012 -0400
+++ b/src/conversation_textview.py  Mon Sep 03 22:02:07 2012 +0400
@@ -1303,7 +1303,7 @@
 timestamp_str = helpers.from_one_line(timestamp_str)
 format_ += timestamp_str
 tim_format = time.strftime(format_, tim)
-if locale.getpreferredencoding() != 'KOI8-R':
+if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'):
 # if tim_format comes as unicode because of day_str.
 # we convert it to the encoding that we want (and that is utf-8)
 tim_format = helpers.ensure_utf8_string(tim_format)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits