Author: Fabrizio
Date: 2010-01-18 23:02:51 +0100 (Mon, 18 Jan 2010)
New Revision: 26847
Added:
plugins/sfQuizPlugin/trunk/i18n/
plugins/sfQuizPlugin/trunk/i18n/en/
plugins/sfQuizPlugin/trunk/i18n/traduzioni_form.en.xml
Modified:
plugins/sfQuizPlugin/trunk/config/routing.yml
plugins/sfQuizPlugin/trunk/config/settings.yml
plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml
plugins/sfQuizPlugin/trunk/lib/form/nomeGiocatoreForm.class.php
plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/indexSuccess.php
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/nomiGiocatoriSuccess.php
Log:
Added initial support for i18n
Modified: plugins/sfQuizPlugin/trunk/config/routing.yml
===================================================================
--- plugins/sfQuizPlugin/trunk/config/routing.yml 2010-01-18 21:52:37 UTC
(rev 26846)
+++ plugins/sfQuizPlugin/trunk/config/routing.yml 2010-01-18 22:02:51 UTC
(rev 26847)
@@ -1,18 +1,24 @@
quiz:
- url: /quiz
+ url: /quiz/:sf_culture
param: { module: sfQuizStart, action: index }
+ sf_culture: (?:it|en|fr|es)
quiz-nomi-giocatori:
- url: /quiz/nomi-giocatori
+ url: /quiz/nomi-giocatori/:sf_culture
param: { module: sfQuizStart, action: nomiGiocatori }
+ sf_culture: (?:it|en|fr|es)
quiz-game:
- url: /quiz/game
+ url: /quiz/game/:sf_culture
param: { module: sfQuizStart, action: game }
+ sf_culture: (?:it|en|fr|es)
quiz-risposta-giusta:
- url: /quiz/risposta-giusta
+ url: /quiz/risposta-giusta/:sf_culture
param: { module: sfQuizStart, action: rispostaGiusta }
+ sf_culture: (?:it|en|fr|es)
quiz-risposta-sbagliata:
- url: /quiz/risposta-sbagliata
+ url: /quiz/risposta-sbagliata/:sf_culture
param: { module: sfQuizStart, action: rispostaSbagliata }
+ sf_culture: (?:it|en|fr|es)
quiz-fine:
- url: /quiz/fine-gioco
- param: { module: sfQuizStart, action: fineGioco }
\ No newline at end of file
+ url: /quiz/fine-gioco/:sf_culture
+ param: { module: sfQuizStart, action: fineGioco }
+ sf_culture: (?:it|en|fr|es)
\ No newline at end of file
Modified: plugins/sfQuizPlugin/trunk/config/settings.yml
===================================================================
--- plugins/sfQuizPlugin/trunk/config/settings.yml 2010-01-18 21:52:37 UTC
(rev 26846)
+++ plugins/sfQuizPlugin/trunk/config/settings.yml 2010-01-18 22:02:51 UTC
(rev 26847)
@@ -2,3 +2,4 @@
.settings:
enabled_modules:
- sfQuizStart
+ i18n: true
Modified: plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml
===================================================================
--- plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml 2010-01-18 21:52:37 UTC
(rev 26846)
+++ plugins/sfQuizPlugin/trunk/data/fixtures/quiz.yml 2010-01-18 22:02:51 UTC
(rev 26847)
@@ -6,12 +6,18 @@
descrizione: >
Questo è un quiz utilizzato per lo sviluppo del plugin sfQuizPlugin
di symfony
+ en:
+ nome: Quiz symfony
+ descrizione: >
+ This is a quiz used for the development of the symfony plugin
sfQuizPlugin
QuizDomande:
Domanda01:
Quiz: Quiz01
Translation:
it:
domanda: In symfony 1.4, qual'è l'ORM predefinito?
+ en:
+ domanda: With symfony 1.4, what is the default ORM?
tipo_risposta: singola
Domanda02:
Quiz: Quiz01
@@ -46,12 +52,16 @@
it:
risposta: Propel
commento: No, propel era l'ORM predefinito nelle versioni precedenti
alla 1.3
+ en:
+ risposta: Propel
QuizDomande: Domanda01
giusta: false
Risposta01b:
Translation:
it:
risposta: Doctrine
+ en:
+ risposta: Doctrine
QuizDomande: Domanda01
giusta: true
Risposta01c:
@@ -59,6 +69,9 @@
it:
risposta: Rocks
commento: http://en.wikipedia.org/wiki/Rocks_%28PHP%29
+ en:
+ risposta: Rocks
+ commento: http://en.wikipedia.org/wiki/Rocks_%28PHP%29
QuizDomande: Domanda01
giusta: false
Risposta01d:
@@ -66,6 +79,9 @@
it:
risposta: Redbean
commento: http://en.wikipedia.org/wiki/Redbean_%28software%29
+ en:
+ risposta: Redbean
+ commento: http://en.wikipedia.org/wiki/Redbean_%28software%29
QuizDomande: Domanda01
giusta: false
Risposta01e:
@@ -73,6 +89,9 @@
it:
risposta: Torpor
commento: http://en.wikipedia.org/wiki/Torpor_%28PHP%29
+ en:
+ risposta: Torpor
+ commento: http://en.wikipedia.org/wiki/Torpor_%28PHP%29
QuizDomande: Domanda01
giusta: false
Risposta02a:
Added: plugins/sfQuizPlugin/trunk/i18n/traduzioni_form.en.xml
===================================================================
--- plugins/sfQuizPlugin/trunk/i18n/traduzioni_form.en.xml
(rev 0)
+++ plugins/sfQuizPlugin/trunk/i18n/traduzioni_form.en.xml 2010-01-18
22:02:51 UTC (rev 26847)
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN"
"http://www.oasis-open.org/committees/xliff/documents/xliff.dtd";>
+<xliff version="1.0">
+ <file original="global" source-language="it" target-language="en"
datatype="plaintext">
+ <header/>
+ <body>
+ <trans-unit id="1">
+ <source>Numero di giocatori</source>
+ <target>Number of players</target>
+ </trans-unit>
+ <trans-unit id="2">
+ <source>Numero delle domande da fare a ciascun giocatore</source>
+ <target>Number of questions to ask each player</target>
+ </trans-unit>
+ </body>
+ </file>
+</xliff>
+
\ No newline at end of file
Property changes on: plugins/sfQuizPlugin/trunk/i18n/traduzioni_form.en.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: plugins/sfQuizPlugin/trunk/lib/form/nomeGiocatoreForm.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/lib/form/nomeGiocatoreForm.class.php
2010-01-18 21:52:37 UTC (rev 26846)
+++ plugins/sfQuizPlugin/trunk/lib/form/nomeGiocatoreForm.class.php
2010-01-18 22:02:51 UTC (rev 26847)
@@ -11,5 +11,6 @@
'max_length' => sfConfig::get('max_length_nome_giocatore')
)));
+
$this->widgetSchema->getFormFormatter()->setTranslationCatalogue('traduzioni_form');
}
}
\ No newline at end of file
Modified: plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
2010-01-18 21:52:37 UTC (rev 26846)
+++ plugins/sfQuizPlugin/trunk/lib/form/numeroGiocatoriForm.class.php
2010-01-18 22:02:51 UTC (rev 26847)
@@ -37,7 +37,6 @@
'numeroDomandePerGiocatore' => new sfValidatorChoice(array('choices' =>
$numDomScelte))
));
-
$this->widgetSchema->getFormFormatter()->setTranslationCatalogue('barra_cerca_copertina_form');
-
+
$this->widgetSchema->getFormFormatter()->setTranslationCatalogue('traduzioni_form');
}
}
\ No newline at end of file
Modified: plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php
===================================================================
--- plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php 2010-01-18 21:52:37 UTC
(rev 26846)
+++ plugins/sfQuizPlugin/trunk/lib/gestioneQuiz.php 2010-01-18 22:02:51 UTC
(rev 26847)
@@ -282,7 +282,8 @@
/**
* Restituisce il numero della domanda corrente del giocatore
*
- * @return number
+ *
+ * @return number Numero domanda (parte da 1)
*/
public function numeroDomandaCorrente()
{
Modified:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
2010-01-18 21:52:37 UTC (rev 26846)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/actions/actions.class.php
2010-01-18 22:02:51 UTC (rev 26847)
@@ -83,9 +83,11 @@
{
$this->quiz = $this->getUser()->getAttribute('quiz');
+
- if($this->quiz->numeroDomandaCorrente() + 1
>=($this->quiz->numDomPerGiocatore() * $this->quiz->numGiocatori()))
+ if($this->quiz->numeroDomandaCorrente()
>($this->quiz->numDomPerGiocatore() * $this->quiz->numGiocatori()))
{
+
$this->redirect('@quiz-fine');
}
Modified:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/indexSuccess.php
===================================================================
--- plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/indexSuccess.php
2010-01-18 21:52:37 UTC (rev 26846)
+++ plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/indexSuccess.php
2010-01-18 22:02:51 UTC (rev 26847)
@@ -1,4 +1,4 @@
-<p>Benvenuti</p>
+<p><?php echo __('Benvenuti') ?></p>
<form method="post">
<?php echo $form['numeroGiocatori']->renderRow() ?><br />
Modified:
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/nomiGiocatoriSuccess.php
===================================================================
---
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/nomiGiocatoriSuccess.php
2010-01-18 21:52:37 UTC (rev 26846)
+++
plugins/sfQuizPlugin/trunk/modules/sfQuizStart/templates/nomiGiocatoriSuccess.php
2010-01-18 22:02:51 UTC (rev 26847)
@@ -3,7 +3,7 @@
<?php foreach ($form['newNomiGiocatori'] as $i => $nome): ?>
<div>
- <?php echo $nome['nomeGiocatore']->renderLabel(_('Nome giocatore').'
'.($i+1)) ?>
+ <?php echo $nome['nomeGiocatore']->renderLabel(__('Nome giocatore %num%',
array('%num%' => ($i+1)))) ?>
<?php echo $nome['nomeGiocatore']->render() ?>
<?php echo $nome['nomeGiocatore']->renderError() ?>
</div>
--
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.
