# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: E:\Web\Server-3.5\udrive\www\bahaistuff\bahaistuff\sites\all\modules\contrib\gtranslate
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: gtranslate.module
--- gtranslate.module Base (BASE)
+++ gtranslate.module Locally Modified (Based On LOCAL)
@@ -160,7 +160,7 @@
                                 default: break;
                             }
 
-                            $block_content .= '<a href="javascript:doTranslate(\''.variable_get('gtranslate_main_lang', 'en').'|'.$lang.'\')" title="'.$lang_name.'" class="flag" style="font-size:'.variable_get('gtranslate_flag_size', '16').'px;padding:1px 0;background-repeat:no-repeat;background-position:-'.($i*100).'px -'.($j*100).'px;"><img src="'.base_path().drupal_get_path('module', 'gtranslate').'/gtranslate-files/blank.png" height="'.variable_get('gtranslate_flag_size', '16').'" width="'.variable_get('gtranslate_flag_size', '16').'" style="border:0;vertical-align:top;" alt="'.$lang_name.'" /></a> ';
+                            $flaggies[$lang] = '<a href="javascript:doTranslate(\''.variable_get('gtranslate_main_lang', 'en').'|'.$lang.'\')" title="'.$lang_name.'" class="flag" style="font-size:'.variable_get('gtranslate_flag_size', '16').'px;padding:1px 0;background-repeat:no-repeat;background-position:-'.($i*100).'px -'.($j*100).'px;"><img src="'.base_path().drupal_get_path('module', 'gtranslate').'/gtranslate-files/blank.png" height="'.variable_get('gtranslate_flag_size', '16').'" width="'.variable_get('gtranslate_flag_size', '16').'" style="border:0;vertical-align:top;" alt="'.$lang_name.'" /></a> ';
                         }
 
                         if($i == 7) {
@@ -170,6 +170,14 @@
                             $i++;
                         }
                     }
+                    if ($flags_order = explode(',', str_replace(' ', '', variable_get('gtranslate_language_order', 'ar,zh-CN,en,fr,ru,es')))) {
+                      foreach($flags_order as $one_flag) {
+                        $block_content .= $flaggies[$one_flag];
+                        unset($flaggies[$one_flag]);
+                      }
+                    }
+                    $flaggies = array_values($flaggies);
+                    $block_content .= count($flaggies) > 1 ? implode('', $flaggies) : $flaggies[0];
 
                 }; break;
                 case 'dropdown': {
@@ -284,12 +292,20 @@
         $form['language']["gtranslate_$lang"] = array(
             '#type' => 'radios',
             '#title' => t("Show $language"),
-            '#default_value' => in_array($lang, $languages_flags) ? 2 : 1,
+            '#default_value' => variable_get("gtranslate_$lang", in_array($lang, $languages_flags) ? 2 : 1),
             '#options' => array(1=>'Yes', 0=>'No', 2=>'As a flag'),
             '#description' => t("Show $language in the language list"),
             '#required' => TRUE
         );
 
+    $form['language']['gtranslate_language_order'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Order of languages for flags view'),
+      '#default_value' => variable_get("gtranslate_language_order", 'ar,zh-CN,en,fr,ru,es'),
+      '#description' => t('Type in a comma-separated list of language codes to order the flags.  Un-named countries will be displayed at the end of the list
+                        in the default order.  The languages are as follows:<br/>' . str_replace('zh', 'zh-', implode(', ', array_keys($languages)))),
+    );
+
\ No newline at end of file
     return system_settings_form($form);
 } // function gtranslate_admin