Skip to content

porting some help texts from simple cms to the routing #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2013
Merged

porting some help texts from simple cms to the routing #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Admin/RouteAdmin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ protected function configureFormFields(FormMapper $formMapper)
array('choice_list' => array(), 'select_root_node' => true, 'root_node' => $this->routeRoot)
)
->add('name', 'text')
->add('addFormatPattern', null, array('required' => false))
->add('addTrailingSlash', null, array('required' => false))
->end();
->add('addFormatPattern', null, array('required' => false, 'help' => 'form.help_add_format_pattern'))
->add('addTrailingSlash', null, array('required' => false, 'help' => 'form.help_add_trailing_slash'))
->end();

if (null === $this->getParentFieldDescription()) {
$formMapper
->with('form.group_general')
->add('variablePattern', 'text', array('required' => false))
->add('content', 'doctrine_phpcr_odm_tree', array('choice_list' => array(), 'required' => false, 'root_node' => $this->contentRoot))
->add('defaults', 'sonata_type_immutable_array', array('keys' => $this->configureFieldsForDefaults()))
->end();
->end();
}
}

Expand Down
8 changes: 8 additions & 0 deletions Resources/translations/CmfRoutingBundle.de.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@
<source>form.label_add_trailing_slash</source>
<target>Abschließenden Schrägstrich hinzufügen</target>
</trans-unit>
<trans-unit id="form.help_add_format_pattern">
<source>form.help_add_format_pattern</source>
<target>Format zu URL hinzufügen: /eine/url.{format}. Wenn nichts angegeben wird ist das Format html.</target>
</trans-unit>
<trans-unit id="form.help_add_trailing_slash">
<source>form.help_add_trailing_slash</source>
<target>Die URL hört in diesem Fall mit einem Schrägstrich auf, zum Beispiel /eine/url/.</target>
</trans-unit>
</body>
</file>
</xliff>
8 changes: 8 additions & 0 deletions Resources/translations/CmfRoutingBundle.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@
<source>form.label_add_trailing_slash</source>
<target>Add trailing slash</target>
</trans-unit>
<trans-unit id="form.help_add_format_pattern">
<source>form.help_add_format_pattern</source>
<target>Append format to route like /your/route.{format}. Default format is html.</target>
</trans-unit>
<trans-unit id="form.help_add_trailing_slash">
<source>form.help_add_trailing_slash</source>
<target>Append a trailing slash to route like /your/route/.</target>
</trans-unit>
</body>
</file>
</xliff>
8 changes: 8 additions & 0 deletions Resources/translations/CmfRoutingBundle.fr.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@
<source>form.label_add_trailing_slash</source>
<target>Ajouter une barre oblique en fin</target>
</trans-unit>
<trans-unit id="form.help_add_format_pattern">
<source>form.help_add_format_pattern</source>
<target>Ajoute le format à la route tel que /your/route.{format}. Le format par défaut est html.</target>
</trans-unit>
<trans-unit id="form.help_add_trailing_slash">
<source>form.help_add_trailing_slash</source>
<target>Ajoute un slash à la fin de la route tel que /your/route/.</target>
</trans-unit>
</body>
</file>
</xliff>