aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2012-12-14 04:01:33 +0100
committerMarcin Kuzminski <marcin@python-works.com>2012-12-14 04:01:33 +0100
commit3a9c28cc8aed0dc6b186caf98939ed0d3fd47066 (patch)
tree78f8dca58793e51d2df866383d456ff8a527cf5b
parent15514dbe02e5b9bdba4126beb1eead0ab299a7f1 (diff)
fixes #682 Translation difficult for multi-line text
--HG-- branch : beta
-rwxr-xr-xdocs/changelog.rst2
-rw-r--r--rhodecode/templates/admin/repos/repo_edit.html4
-rw-r--r--rhodecode/templates/settings/repo_settings.html4
3 files changed, 3 insertions, 7 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index be53fbbe..c4beb78e 100755
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -31,7 +31,7 @@ fixes
- default permissions can get duplicated after migration
- fixed changeset status labels, they now select radio buttons
-
+- #682 translation difficult for multi-line text
1.5.0 (**2012-12-12**)
----------------------
diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html
index 87a0ed6a..47982f68 100644
--- a/rhodecode/templates/admin/repos/repo_edit.html
+++ b/rhodecode/templates/admin/repos/repo_edit.html
@@ -279,9 +279,7 @@
</div>
<div class="field" style="border:none;color:#888">
<ul>
- <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems.
- If you need fully delete it from file system please do it manually''')}
- </li>
+ <li>${_('This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need fully delete it from file system please do it manually')}</li>
</ul>
</div>
</div>
diff --git a/rhodecode/templates/settings/repo_settings.html b/rhodecode/templates/settings/repo_settings.html
index ea277659..37ca4cf7 100644
--- a/rhodecode/templates/settings/repo_settings.html
+++ b/rhodecode/templates/settings/repo_settings.html
@@ -116,9 +116,7 @@
</div>
<div class="field" style="border:none;color:#888">
<ul>
- <li>${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems.
- If you need fully delete it from file system please do it manually''')}
- </li>
+ <li>${_('This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need fully delete it from file system please do it manually')}</li>
</ul>
</div>
</div>