Commit cc09b53e5bca89001e82a68ee3fb60cafea5ee68

Authored by Gedeson Wasley
2 parents ac824f68 cafccb91
Exists in master and in 1 other branch 3.1

Merge branch 'master' of https://github.com/lightbase/cacic

app/config/config.yml
... ... @@ -140,6 +140,23 @@ fm_elfinder:
140 140 driver: elfinder.driver.filesystem
141 141 path: downloads
142 142  
  143 +jms_translation:
  144 + configs:
  145 + app:
  146 + dirs: [%kernel.root_dir%, %kernel.root_dir%/../app]
  147 + output_dir: %kernel.root_dir%/Resources/translations
  148 + ignored_domains: [routes]
  149 + excluded_names: [*TestCase.php, *Test.php]
  150 + excluded_dirs: [cache, data, logs]
  151 + #extractors: [alias_of_the_extractor]
  152 + src:
  153 + dirs: [%kernel.root_dir%, %kernel.root_dir%/../src]
  154 + output_dir: %kernel.root_dir%/../src/Cacic/CommonBundle/Resources/translations
  155 + ignored_domains: [routes]
  156 + excluded_names: [*TestCase.php, *Test.php]
  157 + excluded_dirs: [Common, Entity, Form]
  158 + #extractors: [alias_of_the_extractor]
  159 +
143 160 services:
144 161 twig.text_extension:
145 162 class: Twig_Extensions_Extension_Text
... ... @@ -150,4 +167,4 @@ services:
150 167 cacic_demo.command.demo_command:
151 168 class: Cacic\CommonBundle\Command\DemoCommand
152 169 tags:
153 170 - - { name: console.command }
  171 + - { name: console.command }
154 172 \ No newline at end of file
... ...
app/config/config_dev.yml
... ... @@ -24,21 +24,3 @@ assetic:
24 24  
25 25 #swiftmailer:
26 26 # delivery_address: me@example.com
27   -
28   -
29   -jms_translation:
30   - configs:
31   - app:
32   - dirs: [%kernel.root_dir%, %kernel.root_dir%/../app]
33   - output_dir: %kernel.root_dir%/Resources/translations
34   - ignored_domains: [routes]
35   - excluded_names: [*TestCase.php, *Test.php]
36   - excluded_dirs: [cache, data, logs]
37   - #extractors: [alias_of_the_extractor]
38   - src:
39   - dirs: [%kernel.root_dir%, %kernel.root_dir%/../src]
40   - output_dir: %kernel.root_dir%/../src/Cacic/CommonBundle/Resources/translations
41   - ignored_domains: [routes]
42   - excluded_names: [*TestCase.php, *Test.php]
43   - excluded_dirs: [Common, Entity, Form]
44   - #extractors: [alias_of_the_extractor]
45 27 \ No newline at end of file
... ...
src/Cacic/CommonBundle/Resources/config/validation.yml
... ... @@ -79,44 +79,30 @@ Cacic\CommonBundle\Entity\Rede:
79 79 properties:
80 80 nmRede:
81 81 - NotNull: ~
82   - - Length:
83   - max: 30
84 82 teMascaraRede:
85 83 - NotBlank: ~
86 84 - Length:
87 85 max: 20
88 86 teServCacic:
89 87 - NotBlank: ~
90   - - Length:
91   - max: 20
92 88 teServCacic:
93 89 - NotBlank: ~
94 90 teServUpdates:
95 91 - NotBlank: ~
96   - - Length:
97   - max: 20
98 92 teServUpdates:
99 93 - NotBlank: ~
100 94 nuPortaServUpdates:
101 95 - NotBlank: ~
102   - - Length:
103   - max: 5
104 96 nuLimiteFtp:
105 97 - NotBlank: ~
106 98 - Length:
107 99 max: 5
108 100 nmUsuarioLoginServUpdates:
109 101 - NotBlank: ~
110   - - Length:
111   - max: 20
112 102 nmUsuarioLoginServUpdatesGerente:
113 103 - NotBlank: ~
114   - - Length:
115   - max: 20
116 104 tePathServUpdates:
117 105 - NotBlank: ~
118   - - Length:
119   - max: 20
120 106 nuTelefone1:
121 107 - Length:
122 108 max: 11
... ...