From e84bdf297a4ecbde8c656d6e94caf54c790a409d Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Mon, 7 Dec 2015 17:41:32 +0100
Subject: [PATCH 1/3] Improve readability

---
 rosetta/views.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/rosetta/views.py b/rosetta/views.py
index 330e7057..0861b28e 100644
--- a/rosetta/views.py
+++ b/rosetta/views.py
@@ -202,7 +202,28 @@ def _request_request(key, default=None):
         if _request_request('query', False) and _request_request('query', '').strip():
             query = _request_request('query', '').strip()
             rx = re.compile(re.escape(query), re.IGNORECASE)
-            paginator = Paginator([e_ for e_ in rosetta_i18n_pofile if not e_.obsolete and rx.search(six.text_type(e_.msgstr) + six.text_type(e_.msgid) + u''.join([o[0] for o in e_.occurrences]))], rosetta_settings.MESSAGES_PER_PAGE)
+            paginator = Paginator(
+                [
+                    e_
+                    for e_
+                    in rosetta_i18n_pofile
+                    if (
+                            not e_.obsolete
+                            and rx.search(
+                                six.text_type(e_.msgstr)
+                                + six.text_type(e_.msgid)
+                                + u''.join(
+                                    [
+                                        o[0]
+                                        for o
+                                        in e_.occurrences
+                                    ]
+                                )
+                            )
+                    )
+                ],
+                rosetta_settings.MESSAGES_PER_PAGE,
+            )
         else:
             if rosetta_i18n_filter == 'untranslated':
                 paginator = Paginator(rosetta_i18n_pofile.untranslated_entries(), rosetta_settings.MESSAGES_PER_PAGE)

From d7be77faee6381b1235445d31515a9f9632dcd58 Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Mon, 7 Dec 2015 17:41:45 +0100
Subject: [PATCH 2/3] Treat tcomment as occurrences fallback (in line with
 poedit)

---
 rosetta/templates/rosetta/pofile.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rosetta/templates/rosetta/pofile.html b/rosetta/templates/rosetta/pofile.html
index ced75098..a3048a1f 100644
--- a/rosetta/templates/rosetta/pofile.html
+++ b/rosetta/templates/rosetta/pofile.html
@@ -114,11 +114,15 @@ <h1>{% blocktrans  %}Translate into {{rosetta_i18n_lang_name}}{% endblocktrans %
                                 <input type="checkbox" name="f_{{message.md5hash}}" value="1" {% if message|is_fuzzy %}checked="checked"{% endif %} />
                             </td>
                             <td class="location">
-                                {% for fn,lineno in message.occurrences %}
-                                    <code{% if forloop.counter|gt:"3" %} class="hide"{% endif %}>{{ fn }}:{{lineno}}</code>
-                                {% endfor %}
-                                {% if message.occurrences|length|gt:"3" %}
-                                    <a href="#">&hellip; ({% blocktrans count message.occurrences|length|minus:"3" as more_count %}{{more_count}} more{% plural %}{{more_count}} more{% endblocktrans %})</a>
+                                {% if message.occurrences %}
+                                    {% for fn,lineno in message.occurrences %}
+                                        <code{% if forloop.counter|gt:"3" %} class="hide"{% endif %}>{{ fn }}:{{lineno}}</code>
+                                    {% endfor %}
+                                    {% if message.occurrences|length|gt:"3" %}
+                                        <a href="#">&hellip; ({% blocktrans count message.occurrences|length|minus:"3" as more_count %}{{more_count}} more{% plural %}{{more_count}} more{% endblocktrans %})</a>
+                                    {% endif %}
+                                {% elif message.tcomment %}
+                                    {{ message.tcomment }}
                                 {% endif %}
                             </td>
                     </tr>

From ae30f53b7a62c7e283ce6ec4e2eaf5e9118aa8e4 Mon Sep 17 00:00:00 2001
From: Erwin Junge <erwin@junge.nl>
Date: Mon, 7 Dec 2015 17:42:03 +0100
Subject: [PATCH 3/3] Add search on tcomment

---
 rosetta/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rosetta/views.py b/rosetta/views.py
index 0861b28e..16b52f40 100644
--- a/rosetta/views.py
+++ b/rosetta/views.py
@@ -212,6 +212,7 @@ def _request_request(key, default=None):
                             and rx.search(
                                 six.text_type(e_.msgstr)
                                 + six.text_type(e_.msgid)
+                                + six.text_type(e_.tcomment)
                                 + u''.join(
                                     [
                                         o[0]