Commits

Kai Diefenbach committed 8b7aa8d Merge

Merged 0.7 branch.

Comments (0)

Files changed (4)

 [main]
 host = http://www.transifex.net
 
-[lfs.lfs]
+[lfs.lfs-07]
 source_file = lfs/locale/en/LC_MESSAGES/django.po
 source_lang = en
 trans.de = lfs/locale/de/LC_MESSAGES/django.po
 Unreleased
 ----------
 
+* Bugfix: fixed edit/view product urls; issue #164 (Frank Feng)
 * Bugfix: removed typo; issue #163 (Frank Feng)
 * Bugfix: fixed accessories tab in manage; #issue #162 (Frank Feng)
 * Bugfix: get_base_price_net; #issue #161

docs/misc/contributing_translations.rst

 =========================
-Contribution translations
+Contributing translations
 =========================
 
 There are two preferred ways to contribute translations:

lfs/templates/manage/product/products_inline.html

                     </td>
                     <td class="right-padding management">
                         <a href="{% url lfs_manage_product product.id %}">{% trans "Edit" %}</a> |
-                        <a class="popup-link" href="{% url lfs_product_by_id product.id %}">{% trans 'View' %}</a> | 
-                        <a href="{% url lfs_product_by_id product.id %}">{% trans 'Goto' %}</a>
+                        <a class="popup-link" href="{% url lfs_manage_product_by_id product.id %}">{% trans 'View' %}</a> |
+                        <a href="{% url lfs_manage_product_by_id product.id %}">{% trans 'Goto' %}</a>
                     </td>
                 </tr>
             {% endfor %}
     </form>
 {% else %}
     {% trans "No products found." %}
-{% endif %}
+{% endif %}