Author: annis
Date: 2010-04-12 15:51:34 +0200 (Mon, 12 Apr 2010)
New Revision: 29087
Added:
plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/messages.de.xml.sample
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/README
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/indexAction.php
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
Log:
Merge branch 'master' into HEAD
Modified: plugins/ahAdminGeneratorThemesPlugin/trunk/README
===================================================================
--- plugins/ahAdminGeneratorThemesPlugin/trunk/README 2010-04-12 12:07:38 UTC
(rev 29086)
+++ plugins/ahAdminGeneratorThemesPlugin/trunk/README 2010-04-12 13:51:34 UTC
(rev 29087)
@@ -140,8 +140,43 @@
This is to display the flash messages.
-Pfew, I might have forgotten something. But you can contact me, see the end of
this README. :)
+You'll also need to change the default `class` parameters from
`sfDoctrineGenerator` to `ahDoctrineGenerator` like so:
+ [yaml]
+ generator:
+ class: ahDoctrineGenerator
+ ...
+
+### Real use of the `singular` and `plural` generator.yml parameters ###
+
+Symfony's default admin generator theme the `singular` and `plural` have no
real use which I changed. :) In your `generator.yml` you'll need to set those
like so:
+
+ [yaml]
+ generator:
+ class: ahDoctrineGenerator
+ param:
+ ...
+ singular: Book
+ plural: Books
+ ...
+
+You can even set those to be more than one word which crashes symfony's
default admin generator. Like so:
+
+ [yaml]
+ generator:
+ class: ahDoctrineGenerator
+ param:
+ ...
+ singular: Test Scenario
+ plural: Test Scenarios
+ ...
+
+Those will now be used in the view titles (if you don't change the default
title in the list, new, or edit sections in the `generator.yml`).
+
+Now, here comes another thing you'll need to do (you'll hate me for this, I
think): you'll need to provide a quite extensive i18n file to go with this
because the singular and plural form is also used to provide much better flash
messages. Take a look into the messages.de.xml.sample file that comes with the
plugin. All in all you'll need to provide at least 10 translations per module.
+
+Phew, I might have forgotten something. But you can contact me, see the end of
this README. :)
+
### Configurable show view ###
Activate the show view generation in the `generator.yml`:
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/indexAction.php
===================================================================
---
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/indexAction.php
2010-04-12 12:07:38 UTC (rev 29086)
+++
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/indexAction.php
2010-04-12 13:51:34 UTC (rev 29087)
@@ -3,13 +3,13 @@
$this->getUser()->setNextRedirect('@<?php echo
$this->getUrlForAction('list') ?>');
// sorting
- if ($request->getParameter('sort'))
+ if ($request->hasParameter('sort'))
{
$this->setSort(array($request->getParameter('sort'),
$request->getParameter('sort_type')));
}
// pager
- if ($request->getParameter('page'))
+ if ($request->hasParameter('page'))
{
$this->setPage($request->getParameter('page'),
$request->getParameter('submodule'));
}
Modified:
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
===================================================================
---
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
2010-04-12 12:07:38 UTC (rev 29086)
+++
plugins/ahAdminGeneratorThemesPlugin/trunk/data/generator/sfDoctrineModule/ahAdminGeneratorThemesPluginAdmin/parts/sortingAction.php
2010-04-12 13:51:34 UTC (rev 29087)
@@ -53,7 +53,7 @@
protected function getSort()
{
- if (null !== $sort = $this->getUser()->getAttribute('<?php echo
$this->getModuleName() ?>.sort', null, 'admin_module'))
+ if (null !== ($sort = $this->getUser()->getAttribute('<?php echo
$this->getModuleName() ?>.sort', null, 'admin_module')))
{
return $sort;
}
Added: plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/messages.de.xml.sample
===================================================================
--- plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/messages.de.xml.sample
(rev 0)
+++ plugins/ahAdminGeneratorThemesPlugin/trunk/i18n/messages.de.xml.sample
2010-04-12 13:51:34 UTC (rev 29087)
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<xliff version="1.0">
+ <file source-language="EN" target-language="de" datatype="plaintext"
original="messages" date="2009-08-15T13:24:22Z" product-name="messages">
+ <body>
+ <!-- sfDoctrineGuardPlugin -->
+ <trans-unit>
+ <source>Description</source>
+ <target>Beschreibung</target>
+ </trans-unit>
+ <trans-unit>
+ <source>Filter groups</source>
+ <target>Gruppen filtern</target>
+ </trans-unit>
+ <trans-unit>
+ <source>Filter users</source>
+ <target>Benutzer filtern</target>
+ </trans-unit>
+ <trans-unit>
+ <source>Filter permissions</source>
+ <target>Berechtigungen filtern</target>
+ </trans-unit>
+
+ <!-- sfGuardUser admin module -->
+ <trans-unit>
+ <source>User %1% successfully created</source>
+ <target>Benutzer %1% erfolgreich angelegt</target>
+ </trans-unit>
+ <trans-unit>
+ <source>User %1% successfully updated</source>
+ <target>Benutzer %1% erfolgreich aktualisiert</target>
+ </trans-unit>
+ <trans-unit>
+ <source>User %1% successfully deleted</source>
+ <target>Benutzer %1% erfolgreich gelöscht</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select at least one user and an action to
execute.</source>
+ <target>Sie müssen mindestens einen Benutzer und eine Aktion
auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select an action to execute on the selected
users.</source>
+ <target>Sie müssen eine Aktion zum Ausführen auf den ausgewählten
Benutzern auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select at least one user.</source>
+ <target>Sie müssen mindestens einen Benutzer auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>A problem occurred when deleting the selected users as some
users do not exist anymore.</source>
+ <target>Ein Problem trat beim Löschen der ausgewählten Benutzer auf,
da einige Benutzer nicht mehr existieren.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>The selected users have been deleted successfully.</source>
+ <target>Die ausgewählten Benutzer wurden erfolgreich gelöscht.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>A problem occurred when deleting the selected users.</source>
+ <target>Ein Problem trat beim Löschen der ausgewählten Benutzer
auf.</target>
+ </trans-unit>
+
+ <!-- sfGuardGroup admin module -->
+ <trans-unit>
+ <source>Group %1% successfully created</source>
+ <target>Gruppe %1% erfolgreich angelegt</target>
+ </trans-unit>
+ <trans-unit>
+ <source>Group %1% successfully updated</source>
+ <target>Gruppe %1% erfolgreich aktualisiert</target>
+ </trans-unit>
+ <trans-unit>
+ <source>Group %1% successfully deleted</source>
+ <target>Gruppe %1% erfolgreich gelöscht</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select at least one group and an action to
execute.</source>
+ <target>Sie müssen mindestens eine Gruppe und eine Aktion
auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select an action to execute on the selected
groups.</source>
+ <target>Sie müssen eine Aktion zum Ausführen auf den ausgewählten
Gruppen auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select at least one group.</source>
+ <target>Sie müssen mindestens eine Gruppe auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>A problem occurred when deleting the selected groups as some
groups do not exist anymore.</source>
+ <target>Ein Problem trat beim Löschen der ausgewählten Gruppen auf, da
einige Gruppen nicht mehr existieren.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>The selected groups have been deleted successfully.</source>
+ <target>Die ausgewählten Gruppen wurden erfolgreich gelöscht.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>A problem occurred when deleting the selected groups.</source>
+ <target>Ein Problem trat beim Löschen der ausgewählten Gruppen
auf.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You cannot delete a group you are in yourself!</source>
+ <target>Sie können keine Gruppe löschen, in der Sie selbst eingetragen
sind!</target>
+ </trans-unit>
+
+ <!-- sfGuardPermission admin module -->
+ <trans-unit>
+ <source>Permission %1% successfully created</source>
+ <target>Berechtigung %1% erfolgreich angelegt</target>
+ </trans-unit>
+ <trans-unit>
+ <source>Permission %1% successfully updated</source>
+ <target>Berechtigung %1% erfolgreich aktualisiert</target>
+ </trans-unit>
+ <trans-unit>
+ <source>Permission %1% successfully deleted</source>
+ <target>Berechtigung %1% erfolgreich gelöscht</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select at least one permission and an action to
execute.</source>
+ <target>Sie müssen mindestens eine Berechtigung und eine Aktion
auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select an action to execute on the selected
permissions.</source>
+ <target>Sie müssen eine Aktion zum Ausführen auf den ausgewählten
Berechtigungen auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>You must select at least one permission.</source>
+ <target>Sie müssen mindestens eine Berechtigung auswählen.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>A problem occurred when deleting the selected permissions as
some permissions do not exist anymore.</source>
+ <target>Ein Problem trat beim Löschen der ausgewählten Berechtigungen
auf, da einige Berechtigungen nicht mehr existieren.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>The selected permissions have been deleted
successfully.</source>
+ <target>Die ausgewählten Berechtigungen wurden erfolgreich
gelöscht.</target>
+ </trans-unit>
+ <trans-unit>
+ <source>A problem occurred when deleting the selected
permissions.</source>
+ <target>Ein Problem trat beim Löschen der ausgewählten Berechtigungen
auf.</target>
+ </trans-unit>
+ </body>
+ </file>
+</xliff>
\ No newline at end of file
Modified: plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml
===================================================================
--- plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-12
12:07:38 UTC (rev 29086)
+++ plugins/ahAdminGeneratorThemesPlugin/trunk/package.xml 2010-04-12
13:51:34 UTC (rev 29087)
@@ -10,9 +10,9 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
- <date>2010-03-24</date>
+ <date>2010-04-12</date>
<version>
- <release>0.8.3</release>
+ <release>0.8.4</release>
<api>0.8.0</api>
</version>
<stability>
@@ -59,5 +59,23 @@
Initial release.
</notes>
</release>
+ <release>
+ <version>
+ <release>0.8.4</release>
+ <api>0.8.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <license uri="http://www.symfony-project.com/license";>MIT
license</license>
+ <date>2010-04-12</date>
+ <license>MIT</license>
+ <notes>
+ - check the existence of a request parameter with
+ hasParameter and not with the return value of getParameter
+ - code conventions (missing brackets)
+ </notes>
+ </release>
</changelog>
</package>
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
