Permalink
Browse files

Merge branch 'develop' of github.com:divio/django-cms into issue-1646

  • Loading branch information...
2 parents 96d5dc2 + 832849e commit b60dc281f577e3b0d5280f935dc5cafa861dd475 @czpython czpython committed Mar 23, 2013
Showing with 14,105 additions and 8,452 deletions.
  1. +5 −3 cms/admin/placeholderadmin.py
  2. BIN cms/locale/ar/LC_MESSAGES/django.mo
  3. +169 −169 cms/locale/ar/LC_MESSAGES/django.po
  4. BIN cms/locale/bg/LC_MESSAGES/django.mo
  5. +169 −169 cms/locale/bg/LC_MESSAGES/django.po
  6. BIN cms/locale/bn/LC_MESSAGES/django.mo
  7. +169 −169 cms/locale/bn/LC_MESSAGES/django.po
  8. BIN cms/locale/bn/LC_MESSAGES/djangojs.mo
  9. +8 −9 cms/locale/bn/LC_MESSAGES/djangojs.po
  10. BIN cms/locale/ca/LC_MESSAGES/django.mo
  11. +169 −169 cms/locale/ca/LC_MESSAGES/django.po
  12. BIN cms/locale/cs/LC_MESSAGES/django.mo
  13. +600 −551 cms/locale/cs/LC_MESSAGES/django.po
  14. BIN cms/locale/cy/LC_MESSAGES/django.mo
  15. +169 −169 cms/locale/cy/LC_MESSAGES/django.po
  16. BIN cms/locale/da/LC_MESSAGES/django.mo
  17. +169 −169 cms/locale/da/LC_MESSAGES/django.po
  18. BIN cms/locale/de/LC_MESSAGES/django.mo
  19. +266 −459 cms/locale/de/LC_MESSAGES/django.po
  20. BIN cms/locale/de/LC_MESSAGES/djangojs.mo
  21. +2 −1 cms/locale/de/LC_MESSAGES/djangojs.po
  22. BIN cms/locale/el/LC_MESSAGES/django.mo
  23. +169 −169 cms/locale/el/LC_MESSAGES/django.po
  24. BIN cms/locale/en/LC_MESSAGES/django.mo
  25. +169 −169 cms/locale/en/LC_MESSAGES/django.po
  26. BIN cms/locale/es/LC_MESSAGES/django.mo
  27. +169 −169 cms/locale/es/LC_MESSAGES/django.po
  28. BIN cms/locale/es_AR/LC_MESSAGES/django.mo
  29. +169 −169 cms/locale/es_AR/LC_MESSAGES/django.po
  30. BIN cms/locale/es_BO/LC_MESSAGES/django.mo
  31. +169 −169 cms/locale/es_BO/LC_MESSAGES/django.po
  32. BIN cms/locale/es_DO/LC_MESSAGES/django.mo
  33. +1,931 −0 cms/locale/es_DO/LC_MESSAGES/django.po
  34. BIN cms/locale/et/LC_MESSAGES/django.mo
  35. +169 −169 cms/locale/et/LC_MESSAGES/django.po
  36. BIN cms/locale/eu/LC_MESSAGES/django.mo
  37. +169 −169 cms/locale/eu/LC_MESSAGES/django.po
  38. BIN cms/locale/fa/LC_MESSAGES/django.mo
  39. +169 −169 cms/locale/fa/LC_MESSAGES/django.po
  40. BIN cms/locale/fi/LC_MESSAGES/django.mo
  41. +169 −169 cms/locale/fi/LC_MESSAGES/django.po
  42. BIN cms/locale/fr/LC_MESSAGES/django.mo
  43. +169 −169 cms/locale/fr/LC_MESSAGES/django.po
  44. BIN cms/locale/gu/LC_MESSAGES/django.mo
  45. +169 −169 cms/locale/gu/LC_MESSAGES/django.po
  46. BIN cms/locale/he/LC_MESSAGES/django.mo
  47. +169 −169 cms/locale/he/LC_MESSAGES/django.po
  48. BIN cms/locale/hi/LC_MESSAGES/django.mo
  49. +169 −169 cms/locale/hi/LC_MESSAGES/django.po
  50. BIN cms/locale/hr/LC_MESSAGES/django.mo
  51. +169 −169 cms/locale/hr/LC_MESSAGES/django.po
  52. BIN cms/locale/hu/LC_MESSAGES/django.mo
  53. +169 −169 cms/locale/hu/LC_MESSAGES/django.po
  54. BIN cms/locale/is/LC_MESSAGES/django.mo
  55. +1,943 −0 cms/locale/is/LC_MESSAGES/django.po
  56. BIN cms/locale/is/LC_MESSAGES/djangojs.mo
  57. +39 −0 cms/locale/is/LC_MESSAGES/djangojs.po
  58. BIN cms/locale/it/LC_MESSAGES/django.mo
  59. +169 −169 cms/locale/it/LC_MESSAGES/django.po
  60. BIN cms/locale/ja/LC_MESSAGES/django.mo
  61. +207 −226 cms/locale/ja/LC_MESSAGES/django.po
  62. BIN cms/locale/ka/LC_MESSAGES/django.mo
  63. +169 −169 cms/locale/ka/LC_MESSAGES/django.po
  64. BIN cms/locale/ka/LC_MESSAGES/djangojs.mo
  65. +39 −0 cms/locale/ka/LC_MESSAGES/djangojs.po
  66. BIN cms/locale/km/LC_MESSAGES/django.mo
  67. +169 −169 cms/locale/km/LC_MESSAGES/django.po
  68. BIN cms/locale/ku_IQ/LC_MESSAGES/django.mo
  69. +169 −169 cms/locale/ku_IQ/LC_MESSAGES/django.po
  70. BIN cms/locale/nb/LC_MESSAGES/django.mo
  71. +169 −169 cms/locale/nb/LC_MESSAGES/django.po
  72. BIN cms/locale/nl/LC_MESSAGES/django.mo
  73. +169 −169 cms/locale/nl/LC_MESSAGES/django.po
  74. BIN cms/locale/no/LC_MESSAGES/django.mo
  75. +1,965 −0 cms/locale/no/LC_MESSAGES/django.po
  76. BIN cms/locale/no/LC_MESSAGES/djangojs.mo
  77. +39 −0 cms/locale/no/LC_MESSAGES/djangojs.po
  78. BIN cms/locale/pl/LC_MESSAGES/django.mo
  79. +169 −169 cms/locale/pl/LC_MESSAGES/django.po
  80. BIN cms/locale/pt/LC_MESSAGES/django.mo
  81. +169 −169 cms/locale/pt/LC_MESSAGES/django.po
  82. BIN cms/locale/pt_BR/LC_MESSAGES/django.mo
  83. +169 −169 cms/locale/pt_BR/LC_MESSAGES/django.po
  84. BIN cms/locale/ro/LC_MESSAGES/django.mo
  85. +169 −169 cms/locale/ro/LC_MESSAGES/django.po
  86. BIN cms/locale/ru/LC_MESSAGES/django.mo
  87. +169 −169 cms/locale/ru/LC_MESSAGES/django.po
  88. BIN cms/locale/sk/LC_MESSAGES/django.mo
  89. +169 −169 cms/locale/sk/LC_MESSAGES/django.po
  90. BIN cms/locale/sl_SI/LC_MESSAGES/django.mo
  91. +169 −169 cms/locale/sl_SI/LC_MESSAGES/django.po
  92. BIN cms/locale/sr@latin/LC_MESSAGES/django.mo
  93. +169 −169 cms/locale/sr@latin/LC_MESSAGES/django.po
  94. BIN cms/locale/sv/LC_MESSAGES/django.mo
  95. +280 −437 cms/locale/sv/LC_MESSAGES/django.po
  96. BIN cms/locale/th_TH/LC_MESSAGES/django.mo
  97. +169 −169 cms/locale/th_TH/LC_MESSAGES/django.po
  98. BIN cms/locale/tr/LC_MESSAGES/django.mo
  99. +169 −169 cms/locale/tr/LC_MESSAGES/django.po
  100. BIN cms/locale/uk/LC_MESSAGES/django.mo
  101. +169 −169 cms/locale/uk/LC_MESSAGES/django.po
  102. BIN cms/locale/zh_CN/LC_MESSAGES/django.mo
  103. +169 −169 cms/locale/zh_CN/LC_MESSAGES/django.po
  104. BIN cms/locale/zh_TW/LC_MESSAGES/django.mo
  105. +169 −169 cms/locale/zh_TW/LC_MESSAGES/django.po
  106. +20 −0 compilemessages.py
  107. +1 −6 makemessages.py
@@ -195,19 +195,21 @@ def edit_plugin(self, request, plugin_id):
'CMS_MEDIA_URL': get_cms_setting('MEDIA_URL'),
'plugin': cms_plugin,
'is_popup': True,
- 'name': unicode(cms_plugin),
"type": cms_plugin.get_plugin_name(),
'plugin_id': plugin_id,
'icon': force_escape(escapejs(cms_plugin.get_instance_icon_src())),
'alt': force_escape(escapejs(cms_plugin.get_instance_icon_alt())),
'cancel': True,
}
instance = cms_plugin.get_plugin_instance()[0]
- if not instance:
+ if instance:
+ context['name'] = unicode(instance)
+ else:
# cancelled before any content was added to plugin
cms_plugin.delete()
context.update({
- "deleted":True,
+ "deleted": True,
+ 'name': unicode(cms_plugin),
})
return render_to_response('admin/cms/page/plugin_forms_ok.html', context, RequestContext(request))
Binary file not shown.
Oops, something went wrong.

0 comments on commit b60dc28

Please sign in to comment.