Permalink
Browse files

interface translation completed

italian translation completed

issue referenced: #23
  • Loading branch information...
inmarelibero committed Oct 30, 2012
1 parent 017a1d9 commit 78f4656ef810841c98e6a1fabf7688fc6e46753e
Showing with 252 additions and 107 deletions.
  1. +2 −0 app/config/config.yml
  2. +1 −1 app/config/locales.yml
  3. +15 −1 src/Bricks/SiteBundle/Resources/translations/messages.en.yml
  4. +16 −2 src/Bricks/SiteBundle/Resources/translations/messages.it.yml
  5. +1 −3 src/Bricks/SiteBundle/Resources/translations/{homepage.en.yml → route_homepage.en.yml}
  6. +1 −3 src/Bricks/SiteBundle/Resources/translations/{homepage.it.yml → route_homepage.it.yml}
  7. +1 −1 src/Bricks/SiteBundle/Resources/views/Brick/search.html.twig
  8. +4 −4 src/Bricks/SiteBundle/Resources/views/Default/index.html.twig
  9. +2 −7 src/Bricks/UserBundle/Form/BrickType.php
  10. +45 −2 src/Bricks/UserBundle/Resources/translations/FOSUserBundle.en.yml
  11. +48 −4 src/Bricks/UserBundle/Resources/translations/FOSUserBundle.it.yml
  12. +25 −0 src/Bricks/UserBundle/Resources/translations/UserBundle.en.yml
  13. +26 −0 src/Bricks/UserBundle/Resources/translations/UserBundle.it.yml
  14. +2 −2 src/Bricks/UserBundle/Resources/views/Brick/_deleteForm.html.twig
  15. +23 −10 src/Bricks/UserBundle/Resources/views/Brick/edit.html.twig
  16. +8 −8 src/Bricks/UserBundle/Resources/views/Brick/index.html.twig
  17. +2 −2 src/Bricks/UserBundle/Resources/views/ChangePassword/changePassword.html.twig
  18. +2 −2 src/Bricks/UserBundle/Resources/views/Profile/edit.html.twig
  19. +3 −7 src/Bricks/UserBundle/Resources/views/Registration/checkEmail.html.twig
  20. +2 −8 src/Bricks/UserBundle/Resources/views/Registration/confirmed.html.twig
  21. +3 −20 src/Bricks/UserBundle/Resources/views/Registration/registration.email.twig
  22. +13 −13 src/Bricks/UserBundle/Resources/views/Resetting/request.html.twig
  23. +1 −1 src/Bricks/UserBundle/Resources/views/Security/login.html.twig
  24. +6 −6 src/Bricks/UserBundle/Resources/views/layout.html.twig
View
@@ -55,6 +55,8 @@ swiftmailer:
host: %mailer_host%
username: %mailer_user%
password: %mailer_password%
encryption: ssl
auth_mode: login
spool: { type: memory }
fos_user:
View
@@ -13,7 +13,7 @@ parameters:
# parameter to be used in routes.yml
# add |[locale] if a new interface locale is available
route_locale_requirements: '^it|en$'
route_locale_requirements: 'it|en'
twig:
globals:
@@ -5,6 +5,7 @@
####################################################################################################################
# main navbar
# entries to translate the main navigation bar
main_navbar:
contribute: contribute
github_repository: github repository
@@ -13,6 +14,19 @@ main_navbar:
# entries related to a Brick
brick:
title: title
description: description
content: content
published: published
not_published: not published
last_update: last update
# brick search
search:
title: Results for "%q%"
page_title: Results for "%q%"
# general translations (alphabetical order)
back_to_the_list: Back to the list
delete: delete
edit: edit
save: save
@@ -5,14 +5,28 @@
####################################################################################################################
# main navbar
# entries to translate the main navigation bar
main_navbar:
contribute: contribuisci
github_repository: repository github
register: registrati
sign_in: entra
# entries related to a Brick
# entries regarding stuff related to a Brick
brick:
title: titolo
description: descrizione
content: contenuto
published: pubblicato
not_published: non pubblicato
last_update: ultimo aggiornamento
# brick search
search:
title: Risultati della ricerca "%q%"
page_title: Risultati della ricerca "%q%"
# general translations (alphabetical order)
back_to_the_list: torna alla lista
delete: rimuovi
edit: modifica
save: salva
@@ -3,9 +3,7 @@
# #
# route name: homepage #
####################################################################################################################
how_to_contribute: contribute
sign_up: Sign up
relevant_links: Relevant links
homepage.contribute.next_step: 'The next step is to have a look at <a href="%href%">the section "Contribute"</a> for more detailed informations.'
contribute_next_step: 'The next step is to have a look at <a href="%href%">the section "Contribute"</a> for more detailed informations.'
@@ -3,9 +3,7 @@
# #
# route name: homepage #
####################################################################################################################
how_to_contribute: contribuisci
sign_up: Iscriviti
relevant_links: Link in primo piano
homepage.contribute.next_step: 'Il prossimo passo è visitare <a href="%href%">la sezione "Contribuisci"</a> per avere più informazioni.'
contribute_next_step: 'Il prossimo passo è visitare <a href="%href%">la sezione "Contribuisci"</a> per avere più informazioni.'
@@ -7,7 +7,7 @@
<div class="row">
<div class="span12">
<h1>{{ 'brick.search.title'|trans({'%q%': q}) }}</h1>
<h1>{{ 'brick.search.page_title'|trans({'%q%': q}) }}</h1>
<hr>
@@ -49,15 +49,15 @@
<ul>
<li>
<a href="{{ path('contribute') }}" class="btn">
<i class="icon-hand-right"></i> {{ 'how_to_contribute'|trans({}, 'homepage') }}
<i class="icon-hand-right"></i> {{ 'how_to_contribute'|trans({}, 'route_homepage') }}
</a>
</li>
<li>
<a href="{{ path('fos_user_registration_register') }}" class="btn btn-success"><i class="icon-user icon-white"></i> {{ 'sign_up'|trans({}, 'homepage') }}</a>
<a href="{{ path('fos_user_registration_register') }}" class="btn btn-success"><i class="icon-user icon-white"></i> {{ 'sign_up'|trans({}, 'route_homepage') }}</a>
</li>
</ul>
<div id="relevant-links">
<h2>{{ 'relevant_links'|trans({}, 'homepage') }}</h2>
<h2>{{ 'relevant_links'|trans({}, 'route_homepage') }}</h2>
<ul>
<li><a href="https://github.com/inmarelibero/SymfonyBricks/blob/master/doc/RFC/RFC_1_-_Brick.md" target="_blank">RFC 1 - Brick</a></li>
<li><a href="https://github.com/inmarelibero/SymfonyBricks/issues/1" target="_blank">Tweaking documentation: is the purpose of symfonybricks.com clear?</a></li>
@@ -182,7 +182,7 @@
<br><br><br>
<div class="row">
<div class="span12">
{{ 'homepage.contribute.next_step'|trans({'%href%': path('contribute')}, 'homepage')|raw }}
{{ 'contribute_next_step'|trans({'%href%': path('contribute')}, 'route_homepage')|raw }}
</div>
</div>
</div>
@@ -12,15 +12,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('title', 'textarea', array(
'label' => 'Title',
'error_bubbling' => true
))
->add('description', 'textarea', array(
'label' => 'Description'
))
->add('content', 'textarea', array(
'label' => 'Content'
))
->add('description', 'textarea')
->add('content', 'textarea')
;
}
@@ -3,14 +3,57 @@
security:
login:
title: Sign in
page_title: Sign in
username: "Username:"
password: "Password:"
remember_me: Remember me
submit: Sign in
forgot_password: forgot password?
# Profile
profile:
page_title: Edit profile
# Password change
change_password:
title: Change password
submit: Submit
# Registration
registration:
title: Register on SymfonyBricks
submit: Confirm subscription
submit: Confirm subscription
email:
subject: "SymfonyBricks: Registration"
message: |
Hello %username%, thank you for registrating on SymfonyBricks.
To activate your account visit this link: %confirmationUrl%
Regards,
the SymfonyBricks Team.
message_html: |
Hello %username%, thank you for registrating on SymfonyBricks.
<br><br>
To activate your account visit <a href="%confirmationUrl%">this link.</a>
<br><br><br>
The SymfonyBricks Team.
checkEmail:
page_title: Thank you for your registration!
message: |
An email, containing a security link you must click to activate your account, has been sent to your email address.
congrats: Congrats, you just made the first step to be part of this community!
confirmed:
page_title: Registration confirmed
message: Congrats <b>%username%</b>, your account is active.
# Password resetting
resetting:
title: Request password reset
subtitle: |
Insert your email address in the box below.
<br><br>
You will recive an email with the instructions to reset your password.
request:
username: "Insert your username or email address:"
submit: Reset password
@@ -1,16 +1,60 @@
# Security
"Bad credentials": Invalid username or password
"Bad credentials": Username o password non validi
security:
login:
title: Login
page_title: Login
username: "Username:"
password: "Password:"
remember_me: Mantienimi loggato
submit: Entra
forgot_password: hai dimenticato la password?
# Profile
profile:
page_title: Modifica profilo
# Password change
change_password:
title: Cambia password
submit: Invia
# Registration
registration:
title: Registrati su SymfonyBricks
submit: Conferma iscrizione
submit: Conferma iscrizione
email:
subject: "SymfonyBricks: Registrazione"
message: |
Ciao %username%, grazie per esserti registrato su SymfonyBricks.
Per attivare il tuo account apri questo link: %confirmationUrl%
Saluti,
SymfonyBricks Team.
message_html: |
Ciao %username%, grazie per esserti registrato su SymfonyBricks.
<br><br>
Per attivare il tuo account apri <a href="%confirmationUrl%">questo link.</a>
<br><br><br>
SymfonyBricks Team.
checkEmail:
page_title: Grazie per esserti registrato!
message: |
Ti è stata inviata un'email contenente un link di sicurezza che dovrai aprire per attivare il tuo account.
congrats: Congratulazioni, hai appena compiuto il primo passo per fare parte di questa comunità!
confirmed:
page_title: Registrazione confermata
message: Congratulazioni <b>%username%</b>, il tuo account è ora attivo.
# Password resetting
resetting:
title: Richiedi reset della password
subtitle: |
Inserisci il tuo indirizzo email nel box sottostante.
<br><br>
Riceverai un'email con le istruzioni per resettare la tua password.
request:
username: "Inserisci il tuo username o il tuo indirizzo email:"
submit: Resetta password
@@ -0,0 +1,25 @@
####################################################################################################################
# User interfaces translation #
# #
# entries to translate the templates stored in UserBundle #
####################################################################################################################
# user navbar
# entries to translate the user navigation bar
user_navbar:
dashboard: DASHBOARD
bricks: BRICKS
profile: PROFILE
edit_profile: Edit profile
change_password: Change password
create_brick: CREATE NEW BRICK
# Bricks
# bricks related interfaces
brick:
title: title
create_new_brick: Create a new brick
edit_brick: Edit brick
code: code
preview: preview
confirm_deletion: "This operation cannot be undone. Confirm the deletion?"
@@ -0,0 +1,26 @@
####################################################################################################################
# User interfaces translation #
# #
# entries to translate the templates stored in UserBundle #
####################################################################################################################
# user navbar
# entries to translate the user navigation bar
user_navbar:
dashboard: DASHBOARD
bricks: BRICKS
profile: PROFILO
edit_profile: Modifica profilo
change_password: Cambia password
create_brick: CREA BRICK
# Bricks
# bricks related interfaces
brick:
title: titolo
create_new_brick: Crea un nuovo brick
edit_brick: Modifica brick
code: codice
preview: anteprima
confirm_deletion: "Questa operazione non può essere annullata. Continuare?"
@@ -1,4 +1,4 @@
<form action="{{ path('user_brick_delete', {'id': id}) }}" method="post" {{ form_enctype(form) }} onSubmit="return confirm('This operation cannot be undone. Confirm the deletion?');">
<form action="{{ path('user_brick_delete', {'id': id}) }}" method="post" {{ form_enctype(form) }} onSubmit="return confirm('{{ 'brick.confirm_deletion'|trans({}, 'UserBundle') }}');">
{{ form_widget(form) }}
<button type="submit" class="btn btn-mini"><i class="icon-trash"></i> delete</button>
<button type="submit" class="btn btn-mini"><i class="icon-trash"></i> {{ 'delete'|trans }}</button>
</form>
Oops, something went wrong.

0 comments on commit 78f4656

Please sign in to comment.