--- a/web/common.php Thu Oct 06 19:31:05 2011 +0200
+++ b/web/common.php Fri Oct 07 14:11:35 2011 +0200
@@ -10,45 +10,20 @@
. PATH_SEPARATOR . get_include_path()
);
-function get_config_translations($config) {
-
- $fr = array();
- $en = array();
- $jp = array();
-
- $array_loop = array("fr"=>&$fr,"en"=>&$en,"jp"=>&$jp);
- /**
- * add all config key as translation.
- * translation key is "config__<config_key>"
- */
- foreach ($config as $key => $value) {
- $translation_key = "config__$key";
-
- foreach ($array_loop as $lang => &$lang_array) {
- if(is_array($value) && count(array_intersect_key($value,$array_loop)) > 0 ) {
- if (array_key_exists($lang, $value)) {
- $lang_array[$translation_key] = $value[$lang];
- }
- elseif (array_key_exists('fr', $value)) {
- $lang_array[$translation_key] = $value['fr'];
- }
- }
- else {
- $lang_array[$translation_key] = $value;
- }
- }
- }
-
- return $array_loop;
-
-}
-
/**
* Base configuration
*/
-$C_default_rep = 'JaneMcGonigal-gameDesign';
+$C_default_rep = 'iii-catastrophe';
$C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0';
+$archives_list = array(
+ "rsln", "rsln-opendata", "rsln-mercedes-bunz",
+ "enmi2011-technologie-confiance", "CPV", array("fens_FabLab_Design_Metadata","fablab"),
+array("fens_FabLab_Design_Metadata","designmd"), array("mashup","conference"), array("mashup","tableronde"),
+ "sig-chi-paris-2011", "rwd-meetup-patrimoine"/*, "JaneMcGonigal-gameDesign"*/,
+);
+
+
$configuration = array(
'siteUrl' => 'http://twitter.com/oauth',
'consumerKey' => '***REMOVED***',
@@ -100,6 +75,53 @@
/**
* TRADUCTION
**/
+function get_config_translations($config) {
+
+ $fr = array();
+ $en = array();
+ $jp = array();
+
+ $array_loop = array("fr"=>&$fr,"en"=>&$en,"jp"=>&$jp);
+ /**
+ * add all config key as translation.
+ * translation key is "config__<config_key>"
+ */
+ foreach ($config as $key => $value) {
+ $translation_key = "config__$key";
+
+ foreach ($array_loop as $lang => &$lang_array) {
+ if(is_array($value) && count(array_intersect_key($value,$array_loop)) > 0 ) {
+ if (array_key_exists($lang, $value)) {
+ $lang_array[$translation_key] = $value[$lang];
+ }
+ elseif (array_key_exists('fr', $value)) {
+ $lang_array[$translation_key] = $value['fr'];
+ }
+ }
+ else {
+ $lang_array[$translation_key] = $value;
+ }
+ }
+ }
+
+ return $array_loop;
+
+}
+
+function set_config_translations(&$config, &$translate) {
+
+ $config_translations = get_config_translations($config);
+
+ // save the locale because it gets changed when adding translations
+ $locale = $translate->getLocale();
+
+ $translate->addTranslation($config_translations['en'], 'en');
+ $translate->addTranslation($config_translations['jp'], 'ja_JP');
+ $translate->addTranslation($config_translations['fr'], 'fr');
+
+ // set the locale back
+ $translate->setLocale($locale);
+}
Zend_Loader::loadClass('Zend_Translate');
@@ -115,12 +137,14 @@
$translate->addTranslation($french, 'fr');
if(isset($config)) {
- $config_translations = get_config_translations($config);
+
+ set_config_translations($config, $translate);
+// $config_translations = get_config_translations($config);
- $translate->addTranslation($config_translations['en'], 'en');
- $translate->addTranslation($config_translations['jp'], 'ja_JP');
- $translate->addTranslation($config_translations['fr'], 'fr');
+// $translate->addTranslation($config_translations['en'], 'en');
+// $translate->addTranslation($config_translations['jp'], 'ja_JP');
+// $translate->addTranslation($config_translations['fr'], 'fr');
}
$actual = $translate->getLocale();
@@ -216,12 +240,6 @@
)
);
-$archives_list = array(
- "rsln", "rsln-opendata", "rsln-mercedes-bunz",
- "enmi2011-technologie-confiance", "CPV", array("fens_FabLab_Design_Metadata","fablab"),
- array("fens_FabLab_Design_Metadata","designmd"), array("mashup","conference"), array("mashup","tableronde"),
- "sig-chi-paris-2011", "rwd-meetup-patrimoine"/*, "JaneMcGonigal-gameDesign"*/
-);
function registry_url($key, $type, $registry_def=null) {
@@ -246,19 +264,19 @@
include("$basepath$rep/config.php");
+ set_config_translations($config, $translate);
+/* $config_translations = get_config_translations($config);
- $config_translations = get_config_translations($config);
-
- // save the locale because it gets changed when adding translations
+// save the locale because it gets changed when adding translations
$locale = $translate->getLocale();
$translate->addTranslation($config_translations['en'], 'en');
$translate->addTranslation($config_translations['jp'], 'ja_JP');
$translate->addTranslation($config_translations['fr'], 'fr');
- // set the locale back
+// set the locale back
$translate->setLocale($locale);
-
+ */
$id = "abox_$rep".(($metadata!=null)?"_$metadata":"");
$hash = ($metadata!=null)?"#metadata=$metadata":"";
$tail_img = $translate->_('config__archive_img');