Showing with 74 additions and 24,360 deletions.
  1. +4 −0 CHANGELOG.md
  2. +9 −0 src/ContaoCoreBundle.php
  3. +5 −3 src/Resources/config/commands.yml
  4. +1 −1 src/Resources/contao/config/constants.php
  5. +3 −1 src/Resources/contao/dca/tl_files.php
  6. +2 −0 src/Resources/contao/languages/cs/exception.xlf
  7. +6 −6 src/Resources/contao/languages/de/tl_article.xlf
  8. +1 −0 src/Resources/contao/languages/es/exception.xlf
  9. +5 −0 src/Resources/contao/languages/fa/default.xlf
  10. +1 −0 src/Resources/contao/languages/fr/exception.xlf
  11. +1 −0 src/Resources/contao/languages/ja/exception.xlf
  12. +1 −1 src/Resources/contao/languages/ja/tl_content.xlf
  13. +1 −0 src/Resources/contao/languages/nl/exception.xlf
  14. +0 −993 src/Resources/contao/languages/rm/countries.xlf
  15. +0 −2,339 src/Resources/contao/languages/rm/default.xlf
  16. +0 −147 src/Resources/contao/languages/rm/exception.xlf
  17. +0 −108 src/Resources/contao/languages/rm/explain.xlf
  18. +0 −1,127 src/Resources/contao/languages/rm/languages.xlf
  19. +0 −382 src/Resources/contao/languages/rm/modules.xlf
  20. +0 −282 src/Resources/contao/languages/rm/tl_article.xlf
  21. +0 −795 src/Resources/contao/languages/rm/tl_content.xlf
  22. +0 −262 src/Resources/contao/languages/rm/tl_files.xlf
  23. +0 −246 src/Resources/contao/languages/rm/tl_form.xlf
  24. +0 −558 src/Resources/contao/languages/rm/tl_form_field.xlf
  25. +0 −167 src/Resources/contao/languages/rm/tl_image_size.xlf
  26. +0 −122 src/Resources/contao/languages/rm/tl_image_size_item.xlf
  27. +0 −571 src/Resources/contao/languages/rm/tl_layout.xlf
  28. +0 −94 src/Resources/contao/languages/rm/tl_log.xlf
  29. +0 −165 src/Resources/contao/languages/rm/tl_maintenance.xlf
  30. +0 −297 src/Resources/contao/languages/rm/tl_member.xlf
  31. +0 −114 src/Resources/contao/languages/rm/tl_member_group.xlf
  32. +0 −752 src/Resources/contao/languages/rm/tl_module.xlf
  33. +0 −575 src/Resources/contao/languages/rm/tl_page.xlf
  34. +0 −405 src/Resources/contao/languages/rm/tl_settings.xlf
  35. +0 −642 src/Resources/contao/languages/rm/tl_style.xlf
  36. +0 −166 src/Resources/contao/languages/rm/tl_style_sheet.xlf
  37. +0 −78 src/Resources/contao/languages/rm/tl_templates.xlf
  38. +0 −216 src/Resources/contao/languages/rm/tl_theme.xlf
  39. +0 −62 src/Resources/contao/languages/rm/tl_undo.xlf
  40. +0 −373 src/Resources/contao/languages/rm/tl_user.xlf
  41. +0 −126 src/Resources/contao/languages/rm/tl_user_group.xlf
  42. +1 −0 src/Resources/contao/languages/ru/exception.xlf
  43. +1 −1 src/Resources/contao/languages/ru/tl_image_size_item.xlf
  44. +8 −8 src/Resources/contao/languages/ru/tl_maintenance.xlf
  45. +2 −2 src/Resources/contao/languages/ru/tl_module.xlf
  46. +7 −7 src/Resources/contao/languages/ru/tl_page.xlf
  47. +5 −5 src/Resources/contao/languages/ru/tl_style_sheet.xlf
  48. +5 −5 src/Resources/contao/languages/ru/tl_user.xlf
  49. +0 −997 src/Resources/contao/languages/sv/countries.xlf
  50. +0 −2,333 src/Resources/contao/languages/sv/default.xlf
  51. +0 −147 src/Resources/contao/languages/sv/exception.xlf
  52. +0 −104 src/Resources/contao/languages/sv/explain.xlf
  53. +0 −1,127 src/Resources/contao/languages/sv/languages.xlf
  54. +0 −382 src/Resources/contao/languages/sv/modules.xlf
  55. +0 −282 src/Resources/contao/languages/sv/tl_article.xlf
  56. +0 −795 src/Resources/contao/languages/sv/tl_content.xlf
  57. +0 −262 src/Resources/contao/languages/sv/tl_files.xlf
  58. +0 −246 src/Resources/contao/languages/sv/tl_form.xlf
  59. +0 −557 src/Resources/contao/languages/sv/tl_form_field.xlf
  60. +0 −167 src/Resources/contao/languages/sv/tl_image_size.xlf
  61. +0 −122 src/Resources/contao/languages/sv/tl_image_size_item.xlf
  62. +0 −571 src/Resources/contao/languages/sv/tl_layout.xlf
  63. +0 −94 src/Resources/contao/languages/sv/tl_log.xlf
  64. +0 −165 src/Resources/contao/languages/sv/tl_maintenance.xlf
  65. +0 −297 src/Resources/contao/languages/sv/tl_member.xlf
  66. +0 −114 src/Resources/contao/languages/sv/tl_member_group.xlf
  67. +0 −752 src/Resources/contao/languages/sv/tl_module.xlf
  68. +0 −575 src/Resources/contao/languages/sv/tl_page.xlf
  69. +0 −406 src/Resources/contao/languages/sv/tl_settings.xlf
  70. +0 −639 src/Resources/contao/languages/sv/tl_style.xlf
  71. +0 −166 src/Resources/contao/languages/sv/tl_style_sheet.xlf
  72. +0 −78 src/Resources/contao/languages/sv/tl_templates.xlf
  73. +0 −216 src/Resources/contao/languages/sv/tl_theme.xlf
  74. +0 −62 src/Resources/contao/languages/sv/tl_undo.xlf
  75. +0 −373 src/Resources/contao/languages/sv/tl_user.xlf
  76. +0 −126 src/Resources/contao/languages/sv/tl_user_group.xlf
  77. +1 −1 src/Resources/contao/themes/flexible/basic.css
  78. +4 −0 src/Resources/contao/themes/flexible/src/basic.css
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Contao core bundle change log

### 4.3.11 (2017-06-02)

* Fix an incompatibility issue with Symfony 3.3 (see #760).

### 4.3.10 (2017-05-16)

* Correctly save and duplicate in the parent view (see #797).
Expand Down
9 changes: 9 additions & 0 deletions src/ContaoCoreBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Contao\CoreBundle\DependencyInjection\Compiler\AddSessionBagsPass;
use Contao\CoreBundle\DependencyInjection\Compiler\DoctrineMigrationsPass;
use Contao\CoreBundle\DependencyInjection\ContaoCoreExtension;
use Symfony\Component\Console\Application;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;

Expand All @@ -38,6 +39,14 @@ public function getContainerExtension()
return new ContaoCoreExtension();
}

/**
* {@inheritdoc}
*/
public function registerCommands(Application $application)
{
// All core-bundle commands are registered as services
}

/**
* {@inheritdoc}
*/
Expand Down
8 changes: 5 additions & 3 deletions src/Resources/config/commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ services:
tags:
- { name: console.command }

contao.command.user_password_command:
class: Contao\CoreBundle\Command\UserPasswordCommand
tags:
- { name: console.command }

contao.command.version:
class: Contao\CoreBundle\Command\VersionCommand
tags:
- { name: console.command }

console.command.contao_corebundle_command_doctrinemigrationsdiffcommand:
synthetic: true # prevent auto-registration by Bundle::registerCommands
2 changes: 1 addition & 1 deletion src/Resources/contao/config/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// Core version
define('VERSION', '4.3');
define('BUILD', '10');
define('BUILD', '11');
define('LONG_TERM_SUPPORT', false);

// Link constants
Expand Down
4 changes: 3 additions & 1 deletion src/Resources/contao/dca/tl_files.php
Original file line number Diff line number Diff line change
Expand Up @@ -708,13 +708,15 @@ public function protectFolder(DataContainer $dc)
}
}

$class = $GLOBALS['TL_DCA'][$dc->table]['fields'][$dc->field]['eval']['tl_class'] . ' cbx"';
$class = $GLOBALS['TL_DCA'][$dc->table]['fields'][$dc->field]['eval']['tl_class'] . ' cbx';

if (Input::get('act') == 'editAll' || Input::get('act') == 'overrideAll')
{
$class = str_replace(array('w50', 'clr', 'wizard', 'long', 'm12', 'cbx'), '', $class);
}

$class = trim('widget ' . $class);

return '
<div class="' . $class . '">
<div id="ctrl_' . $dc->field . '" class="tl_checkbox_single_container">
Expand Down
2 changes: 2 additions & 0 deletions src/Resources/contao/languages/cs/exception.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
</trans-unit>
<trans-unit id="XPT.errorFixOne">
<source>Open the current log file in the &lt;code&gt;var/logs&lt;/code&gt; or &lt;code&gt;app/logs&lt;/code&gt; directory and find the associated error message (usually the last one).</source>
<target>Otevřete současný soubor log ve složce &lt;code&gt;var/logs&lt;/code&gt; nebo &lt;code&gt;app/logs&lt;/code&gt; a najděte dané chybové hlášení (pravděpodobně jedno z posledních)</target>
</trans-unit>
<trans-unit id="XPT.errorExplain">
<source>The script execution stopped, because something does not work properly. The actual error message is hidden by this notice for security reasons and can be found in the current log file (see above). If you do not understand the error message or do not know how to fix the problem, search the &lt;a href=&quot;https://contao.org/faq.html&quot; target=&quot;_blank&quot;&gt;Contao FAQs&lt;/a&gt; or visit the &lt;a href=&quot;https://contao.org/support.html&quot; target=&quot;_blank&quot;&gt;Contao support page&lt;/a&gt;.</source>
Expand Down Expand Up @@ -62,6 +63,7 @@
</trans-unit>
<trans-unit id="XPT.incompleteFix">
<source>Please open the Contao install tool (&lt;code&gt;/contao/install&lt;/code&gt;) in your browser.</source>
<target>Otevřete prosím instalační nástroj Contaa (&lt;code&gt;/contao/install&lt;/code&gt;) ve Vašem prohlížeči.</target>
</trans-unit>
<trans-unit id="XPT.incompleteExplain">
<source>For more information, please refer to the &lt;a href=&quot;https://contao.org/manual/installation.html&quot; target=&quot;_blank&quot;&gt;Contao manual&lt;/a&gt;.</source>
Expand Down
12 changes: 6 additions & 6 deletions src/Resources/contao/languages/de/tl_article.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,15 @@
</trans-unit>
<trans-unit id="tl_article.new.0">
<source>New article</source>
<target>Neuer Beitrag</target>
<target>Neuer Artikel</target>
</trans-unit>
<trans-unit id="tl_article.new.1">
<source>Create a new article</source>
<target>Einen neuen Artikel anlegen</target>
</trans-unit>
<trans-unit id="tl_article.show.0">
<source>Article details</source>
<target>Beitragsdetails</target>
<target>Artikeldetails</target>
</trans-unit>
<trans-unit id="tl_article.show.1">
<source>Show the details of article ID %s</source>
Expand All @@ -231,31 +231,31 @@
</trans-unit>
<trans-unit id="tl_article.copy.0">
<source>Duplicate article</source>
<target>Beitrag duplizieren</target>
<target>Artikel duplizieren</target>
</trans-unit>
<trans-unit id="tl_article.copy.1">
<source>Duplicate article ID %s</source>
<target>Artikel ID %s duplizieren</target>
</trans-unit>
<trans-unit id="tl_article.cut.0">
<source>Move article</source>
<target>Beitrag verschieben</target>
<target>Artikel verschieben</target>
</trans-unit>
<trans-unit id="tl_article.cut.1">
<source>Move article ID %s</source>
<target>Artikel ID %s verschieben</target>
</trans-unit>
<trans-unit id="tl_article.delete.0">
<source>Delete article</source>
<target>Beitrag löschen</target>
<target>Artikel löschen</target>
</trans-unit>
<trans-unit id="tl_article.delete.1">
<source>Delete article ID %s</source>
<target>Artikel ID %s löschen</target>
</trans-unit>
<trans-unit id="tl_article.toggle.0">
<source>Publish/unpublish article</source>
<target>Beitrag veröffentlichen/unveröffentlichen</target>
<target>Artikel veröffentlichen/unveröffentlichen</target>
</trans-unit>
<trans-unit id="tl_article.toggle.1">
<source>Publish/unpublish article ID %s</source>
Expand Down
1 change: 1 addition & 0 deletions src/Resources/contao/languages/es/exception.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
</trans-unit>
<trans-unit id="XPT.incompleteFix">
<source>Please open the Contao install tool (&lt;code&gt;/contao/install&lt;/code&gt;) in your browser.</source>
<target>Por favor abra la herramienta de instalación de Contao (&lt;code&gt;/contao/install&lt;/code&gt;) en su navegador.</target>
</trans-unit>
<trans-unit id="XPT.incompleteExplain">
<source>For more information, please refer to the &lt;a href=&quot;https://contao.org/manual/installation.html&quot; target=&quot;_blank&quot;&gt;Contao manual&lt;/a&gt;.</source>
Expand Down
5 changes: 5 additions & 0 deletions src/Resources/contao/languages/fa/default.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,7 @@
</trans-unit>
<trans-unit id="MSC.sw_template">
<source>Template</source>
<target>قالب</target>
</trans-unit>
<trans-unit id="MSC.sw_position">
<source>Position</source>
Expand Down Expand Up @@ -1352,6 +1353,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
</trans-unit>
<trans-unit id="MSC.feUser">
<source>Member</source>
<target>عضو</target>
</trans-unit>
<trans-unit id="MSC.backToTop">
<source>Back to top</source>
Expand All @@ -1371,6 +1373,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
</trans-unit>
<trans-unit id="MSC.burgerTitle">
<source>Toggle navigation</source>
<target>تعویض ناوبری</target>
</trans-unit>
<trans-unit id="MSC.user">
<source>User</source>
Expand Down Expand Up @@ -1486,6 +1489,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
</trans-unit>
<trans-unit id="MSC.saveNduplicate">
<source>Save and duplicate</source>
<target>ذخیره و تکثیر</target>
</trans-unit>
<trans-unit id="MSC.continue">
<source>Continue</source>
Expand Down Expand Up @@ -2352,6 +2356,7 @@ This e-mail has been generated by Contao. You can not reply to it directly.
</trans-unit>
<trans-unit id="SECTIONS.manual">
<source>Manual output</source>
<target>خروجی دستی</target>
</trans-unit>
</body>
</file>
Expand Down
1 change: 1 addition & 0 deletions src/Resources/contao/languages/fr/exception.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
</trans-unit>
<trans-unit id="XPT.incompleteFix">
<source>Please open the Contao install tool (&lt;code&gt;/contao/install&lt;/code&gt;) in your browser.</source>
<target>Veuillez, s'il vous plaît, ouvrir l'outil d'installation de Contao (&lt;code&gt;/contao/install&lt;/code&gt;) dans votre navigateur.</target>
</trans-unit>
<trans-unit id="XPT.incompleteExplain">
<source>For more information, please refer to the &lt;a href=&quot;https://contao.org/manual/installation.html&quot; target=&quot;_blank&quot;&gt;Contao manual&lt;/a&gt;.</source>
Expand Down
1 change: 1 addition & 0 deletions src/Resources/contao/languages/ja/exception.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
</trans-unit>
<trans-unit id="XPT.incompleteFix">
<source>Please open the Contao install tool (&lt;code&gt;/contao/install&lt;/code&gt;) in your browser.</source>
<target>Contaoのインストールツール(&lt;code&gt;/contao/install&lt;/code&gt;)をブラウザーで開いてください。</target>
</trans-unit>
<trans-unit id="XPT.incompleteExplain">
<source>For more information, please refer to the &lt;a href=&quot;https://contao.org/manual/installation.html&quot; target=&quot;_blank&quot;&gt;Contao manual&lt;/a&gt;.</source>
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/contao/languages/ja/tl_content.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
</trans-unit>
<trans-unit id="tl_content.useHomeDir.1">
<source>Use the home directory as file source if there is an authenticated user.</source>
<target>認証済みのユーザーはホームディレクトリをファイルの情報元に使用します。</target>
<target>認証済みのユーザーの場合はホームディレクトリをファイルの情報元に使用します。</target>
</trans-unit>
<trans-unit id="tl_content.perRow.0">
<source>Thumbnails per row</source>
Expand Down
1 change: 1 addition & 0 deletions src/Resources/contao/languages/nl/exception.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
</trans-unit>
<trans-unit id="XPT.incompleteFix">
<source>Please open the Contao install tool (&lt;code&gt;/contao/install&lt;/code&gt;) in your browser.</source>
<target>Open het Contao installatieprogramma (&lt;code&gt;/contao/install&lt;/code&gt;) in uw browser.</target>
</trans-unit>
<trans-unit id="XPT.incompleteExplain">
<source>For more information, please refer to the &lt;a href=&quot;https://contao.org/manual/installation.html&quot; target=&quot;_blank&quot;&gt;Contao manual&lt;/a&gt;.</source>
Expand Down
Loading