##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2487:fcee5614 default
r2784:e8c62649 default
Show More
translation.py
64 lines | 1.9 KiB | text/x-python | PythonLexer
# Copyright (C) 2016-2018 RhodeCode GmbH
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
from pyramid.i18n import TranslationStringFactory, TranslationString
# Create a translation string factory for the 'rhodecode' domain.
from pyramid.threadlocal import get_current_request
_ = TranslationStringFactory('rhodecode')
class _LazyString(object):
def __init__(self, *args, **kw):
self.args = args
self.kw = kw
def eval(self):
req = get_current_request()
translator = _
if req:
translator = req.translate
return translator(*self.args, **self.kw)
def __unicode__(self):
return unicode(self.eval())
def __str__(self):
return self.eval()
def __repr__(self):
return self.__str__()
def __mod__(self, other):
return self.eval() % other
def format(self, *args):
return self.eval().format(*args)
def lazy_ugettext(*args, **kw):
""" Lazily evaluated version of _() """
return _LazyString(*args, **kw)
def _pluralize(msgid1, msgid2, n, mapping=None):
if n == 1:
return _(msgid1, mapping=mapping)
else:
return _(msgid2, mapping=mapping)