fixes localization issues with end of line returns. OSQA-304 and 309

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@542 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index d03af253a5b246e04267de41dc093ad242e94a60..430a304156e8069aa3677d417be0dd6d4b4b85c2 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -99,9 +99,7 @@
             {% if question.nis.closed %}\r
             <div class="question-status" style="margin-bottom:15px">\r
             <h3>\r
             {% if question.nis.closed %}\r
             <div class="question-status" style="margin-bottom:15px">\r
             <h3>\r

-                {% blocktrans with question.nstate.closed.extra as close_reason %}\r
-                    The question has been closed for the following reason "{{ close_reason }}" by\r
-                {% endblocktrans %}\r
+                {% blocktrans with question.nstate.closed.extra as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %}\r

                 <a href="{{ question.nstate.closed.by.get_profile_url }}">{{ question.nstate.closed.by.username }}</a>\r
                  {% diff_date question.nstate.closed.at %}\r
             </h3>\r
                 <a href="{{ question.nstate.closed.by.get_profile_url }}">{{ question.nstate.closed.by.username }}</a>\r
                  {% diff_date question.nstate.closed.at %}\r
             </h3>\r


@@ -112,11 +110,7 @@
                 <div class="tabBar">\r
                     <a name="sort-top"></a>\r
                     <div class="headQuestions">\r
                 <div class="tabBar">\r
                     <a name="sort-top"></a>\r
                     <div class="headQuestions">\r

-                    {% blocktrans count answers.paginator.count as counter %}\r
-                    One Answer:\r
-                    {% plural %}\r
-                    {{counter}} Answers:\r
-                    {% endblocktrans %}\r
+                    {% blocktrans count answers.paginator.count as counter %}One Answer:{% plural %}{{counter}} Answers:{% endblocktrans %}\r

                     </div>\r
                     {{ answers.paginator.sort_tabs }}\r
                 </div>\r
                     </div>\r
                     {{ answers.paginator.sort_tabs }}\r
                 </div>\r