setup language registration.

taylorotwell · taylorotwell · commit 2e6e4d92f356 · 2012-05-28T15:59:41.000-05:00
diff --git a/app/app.php b/app/app.php
@@ -56,6 +56,28 @@
 	$app[$key] = $value;
 }
 
+/*
+|--------------------------------------------------------------------------
+| Load The Application Translation Messages
+|--------------------------------------------------------------------------
+|
+| Here we'll load all of the language messages for the application, which
+| are all stored in a single language file. The translator service is
+| automatically registered for us via the core services provider.
+|
+*/
+
+$messages = require __DIR__.'/lang.php';
+
+$domains = array();
+
+if (isset($app['translator.domains']))
+{
+	$domains = $app['translator.domains'];
+}
+
+$app['translator.domains'] = array_merge($domains, compact('messages'));
+
 /*
 |--------------------------------------------------------------------------
 | Register The Core Service Provider
diff --git a/app/lang.php b/app/lang.php
@@ -0,0 +1,7 @@
+<?php
+
+return array(
+
+	'en' => array(),
+
+);
diff --git a/app/routes.php b/app/routes.php
@@ -14,19 +14,5 @@
 
 $app->get('/', function() use ($app)
 {
-	/*
-	$app['locale'] = 'en';
-	$app->register(new Silex\Provider\TranslationServiceProvider, array(
-		'locale' => 'en',
-		'locale_fallback' => 'en',
-		'translator.domains' => array(
-			'messages' => array(
-				'en' => array(
-					'hello' => 'Hello, :name',
-				),
-			),
-		),
-	));
-	*/
 	return $app->twig->render('hello.twig.html');
 });
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
 	"require": {
-		"illuminate/foundation": ">=1.0.0",
+		"illuminate/foundation": ">=1.0.0"
 	}
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +return array(
++
 +	'en' => array(),
++
 +);
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "illuminate/foundation": ">=1.0.0",`
	`3`	`+ "illuminate/foundation": ">=1.0.0"`
`4`	`4`	`}`
`5`	`5`	`}`