[Testbot] Plone 4.3 - Python 2.6 - Build # 2649 - Still failing! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Mon Jan 26 13:42:02 UTC 2015
-------------------------------------------------------------------------------
Plone 4.3 - Python 2.6 - Build # 2649 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-4.3-python-2.6/2649/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: Products.CMFPlone
Branch: refs/heads/4.3.x
Date: 2015-01-21T17:30:41+01:00
Author: Peter Holzer (agitator) <hpeter at agitator.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/58b4e258fa8aae98f0d464a5ad3743ed16ea1b5d
Extended ulocalized_time for target_language
Files changed:
M Products/CMFPlone/i18nl10n.py
M docs/CHANGES.rst
diff --git a/Products/CMFPlone/i18nl10n.py b/Products/CMFPlone/i18nl10n.py
index 1db455d..792f63a 100644
--- a/Products/CMFPlone/i18nl10n.py
+++ b/Products/CMFPlone/i18nl10n.py
@@ -103,7 +103,7 @@ def get_formatstring_from_registry(msgid):
def ulocalized_time(time, long_format=None, time_only=False, context=None,
- domain='plonelocales', request=None):
+ domain='plonelocales', request=None, target_language=None):
"""unicode aware localized time method (l10n)"""
if time_only:
@@ -167,7 +167,8 @@ def ulocalized_time(time, long_format=None, time_only=False, context=None,
# 2. the normal case: translation machinery,
# that is the ".../LC_MESSAGES/plonelocales.po" files
- formatstring = translate(msgid, domain, mapping, request)
+ formatstring = translate(msgid, domain, mapping, request,
+ target_language=target_language)
# 3. if both failed, fall back to hardcoded ISO style
if formatstring == msgid:
@@ -219,10 +220,12 @@ def ulocalized_time(time, long_format=None, time_only=False, context=None,
# translate translateable elements
for key in name_elements:
mapping[key] = translate(mapping[key], domain,
- context=request, default=mapping[key])
+ context=request, default=mapping[key],
+ target_language=target_language)
# translate the time string
- return translate(msgid, domain, mapping, request)
+ return translate(msgid, domain, mapping, request,
+ target_language=target_language)
def _numbertoenglishname(number, format=None, attr='_days'):
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 118c2fe..91ba19c 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -8,6 +8,9 @@ Changelog
4.3.5 (unreleased)
------------------
+- Extended ulocalized_time for target_language
+ [agitator]
+
- Allow search_rss view on subsites (implementing INavigationRoot, not only
IPloneSiteRoot) like it was the case in Plone 4.1.6.
[vincentfretin]
Repository: Products.CMFPlone
Branch: refs/heads/4.3.x
Date: 2015-01-26T14:02:52+01:00
Author: Johannes Raggam (thet) <raggam-nl at adm.at>
Commit: https://github.com/plone/Products.CMFPlone/commit/e63fe1c73d7f5b37d1e3e5d4e59db50283ce1a21
Merge pull request #354 from plone/target_language_for_ulocalized_time
Extended ulocalized_time for target_language
Files changed:
M Products/CMFPlone/i18nl10n.py
M docs/CHANGES.rst
diff --git a/Products/CMFPlone/i18nl10n.py b/Products/CMFPlone/i18nl10n.py
index 1db455d..792f63a 100644
--- a/Products/CMFPlone/i18nl10n.py
+++ b/Products/CMFPlone/i18nl10n.py
@@ -103,7 +103,7 @@ def get_formatstring_from_registry(msgid):
def ulocalized_time(time, long_format=None, time_only=False, context=None,
- domain='plonelocales', request=None):
+ domain='plonelocales', request=None, target_language=None):
"""unicode aware localized time method (l10n)"""
if time_only:
@@ -167,7 +167,8 @@ def ulocalized_time(time, long_format=None, time_only=False, context=None,
# 2. the normal case: translation machinery,
# that is the ".../LC_MESSAGES/plonelocales.po" files
- formatstring = translate(msgid, domain, mapping, request)
+ formatstring = translate(msgid, domain, mapping, request,
+ target_language=target_language)
# 3. if both failed, fall back to hardcoded ISO style
if formatstring == msgid:
@@ -219,10 +220,12 @@ def ulocalized_time(time, long_format=None, time_only=False, context=None,
# translate translateable elements
for key in name_elements:
mapping[key] = translate(mapping[key], domain,
- context=request, default=mapping[key])
+ context=request, default=mapping[key],
+ target_language=target_language)
# translate the time string
- return translate(msgid, domain, mapping, request)
+ return translate(msgid, domain, mapping, request,
+ target_language=target_language)
def _numbertoenglishname(number, format=None, attr='_days'):
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index d3ac6dc..7cdc1fc 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -8,6 +8,9 @@ Changelog
4.3.5 (unreleased)
------------------
+- Extended ulocalized_time for target_language
+ [agitator]
+
- Allow search_rss view on subsites (implementing INavigationRoot, not only
IPloneSiteRoot) like it was the case in Plone 4.1.6.
[vincentfretin]
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 5048 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20150126/e67a6167/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 189454 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20150126/e67a6167/attachment-0003.obj>
More information about the Testbot
mailing list