Changeset 1097

Timestamp:

10/06/08 01:45:42 (2 months ago)

Author:

Pernod

Message:

Added multi language support for the media type selections. Fixes #86

Files:

• trunk/swisscenter/config/config_dirs.php (modified) (4 diffs)
• trunk/swisscenter/config/config_media.php (modified) (3 diffs)
• trunk/swisscenter/lang/en/en.xml (modified) (1 diff)

trunk/swisscenter/config/config_dirs.php

@@ -41 +41 @@
-    $share_opts = array_merge(array(array("path"=>'', "name"=>'')), $share_opts);
-
+    // Form list of media types
+    $media_type_opts = db_toarray('select media_id,media_name from media_types order by 2');
+
+    // Use language translation for MEDIA_NAME
+    for ($i = 0; $i<count($media_type_opts); $i++)
+    {
+      $media_type_opts[$i]["MEDIA_NAME"] = str('MEDIA_TYPE_'.strtoupper($media_type_opts[$i]["MEDIA_NAME"]));
+      $media_type_list[$media_type_opts[$i]["MEDIA_NAME"]] = $media_type_opts[$i]["MEDIA_ID"];
+    }
+
-    $data = db_toarray("select location_id,media_name 'Type', cat_name 'Category', cert.name 'Certificate', ml.name 'Directory', ".
-                       "(CASE media_id WHEN ".MEDIA_TYPE_VIDEO." THEN ".$share_sql_case."ELSE '' END) 'Share' ".
@@ -46 +56 @@
-                       "where ml.unrated=cert.cert_id and mt.media_id = ml.media_type and ml.cat_id = cat.cat_id order by 2,3,4");
-
+    // Use language translation for MEDIA_NAME
+    for ($i = 0; $i<count($data); $i++)
+      $data[$i]["TYPE"] = str('MEDIA_TYPE_'.strtoupper($data[$i]["TYPE"]));
+          
-    // Try to determine sensible default values for "Category" and "Certification".
-    if (empty($_REQUEST["cat"]))
@@ -59 +73 @@
-    form_select_table('loc_id',$data, str('MEDIA_LOC_HEADINGS')
-                     ,array('class'=>'form_select_tab','width'=>'100%'),'location_id',
-'select media_id,media_name from media_types order by 2'
+$media_type_opts
-                            'CATEGORY'=>'select cat_id,cat_name from categories where cat_id not in ('.
-                                         implode(',', db_col_to_list('select distinct parent_id from categories')).') order by cat_name',
@@ -79 +93 @@
-    else
-      form_label(str('NETWORK_SHARE_PROMPT'));
-dynamic('type',str('MEDIA_TYPE'),"select media_id,media_name from media_types order by 2",
+static('type',str('MEDIA_TYPE'), $media_type_list, 
-    form_label(str('MEDIA_TYPE_PROMPT'));
-    form_list_dynamic('cat', str('CATEGORY'),"select cat_id,cat_name from categories where cat_id not in (".

trunk/swisscenter/config/config_media.php

@@ -33 +33 @@
-    
-        $headings = str('MEDIA_TYPE').','.str('CATEGORY').','.str('LOCATION').','.str('PERCENT_SCANNED');
-
+
+
+
+
+
+
+
-
-        echo '<p><table width="50%" class="form_select_tab"><tr><th width="60%">'.str('MEDIA_SCAN_STATUS').'</th><td align="right">'.$status.'</td>';
@@ -103 +109 @@
-  {  
-    $option_vals = array( str('YES')=>'YES',str('NO')=>'NO');
+
+    // Form list of media types
+    $media_type_opts = db_toarray("select media_id,media_name from media_types where media_table<>'' order by 2");
+    // Use language translation for MEDIA_NAME
+    for ($i = 0; $i<count($media_type_opts); $i++)
+    {
+      $media_type_opts[$i]["MEDIA_NAME"] = str('MEDIA_TYPE_'.strtoupper($media_type_opts[$i]["MEDIA_NAME"]));
+      $media_type_list[$media_type_opts[$i]["MEDIA_NAME"]] = $media_type_opts[$i]["MEDIA_ID"];
+    }
-    
-    echo '<h1>'.str('SETUP_SEARCH_NEW_MEDIA').'</h1>
@@ -111 +126 @@
-    form_hidden('action', 'SEARCH');
-    form_hidden('scan_type', 'MEDIA');
-dynamic('type',str('MEDIA_TYPE'),"select media_id,media_name from media_types where media_table<>'' order by 2"
+static('type', str('MEDIA_TYPE'),$media_type_list
-    echo '<tr><td></td><td> &nbsp; &nbsp; '.str('OR').'</td></tr>';
-    form_list_dynamic('cat', str('CATEGORY'),"select distinct(c.cat_id), c.cat_name from media_locations ml, categories c

trunk/swisscenter/lang/en/en.xml

@@ -1993 +1993 @@
-      </string>
-      <string>
+        <id>MEDIA_TYPE_MUSIC</id>
+        <text>Audio</text>
+        <version>1.21.1</version>
+      </string>
+      <string>
+        <id>MEDIA_TYPE_PHOTO</id>
+        <text>Photo</text>
+        <version>1.21.1</version>
+      </string>
+      <string>
-        <id>MEDIA_TYPE_PROMPT</id>
-        <text>Please select the type of media that this location should be searched for.</text>
-        <version>1.19</version>
+      </string>
+      <string>
+        <id>MEDIA_TYPE_RADIO</id>
+        <text>Radio</text>
+        <version>1.21.1</version>
+      </string>
+      <string>
+        <id>MEDIA_TYPE_TV SERIES</id>
+        <text>TV Series</text>
+        <version>1.21.1</version>
+      </string>
+      <string>
+        <id>MEDIA_TYPE_VIDEO</id>
+        <text>Video</text>
+        <version>1.21.1</version>
+      </string>
+      <string>
+        <id>MEDIA_TYPE_WEB</id>
+        <text>Web</text>
+        <version>1.21.1</version>
-      </string>
-      <string>