1 7899 dave --- firefox/browser/app/mozilla.in.ori 2006-03-27 18:19:34.647520000 +0800 2 7899 dave +++ firefox/browser/app/mozilla.in 2006-03-30 11:34:28.242248000 +0800 3 7899 dave @@ -144,6 +144,12 @@ 4 7899 dave mimeset -F "$MOZILLA_BIN" 5 7899 dave fi 6 7899 dave 7 7899 dave +# Set as current locale if no related args specified 8 7899 dave +# If required language file doesn't exist, $MOZILLA_BIN 9 7899 dave +# would use english version 10 7899 dave +moz_uilocale=`echo $LANG | sed "s|_\([^.@]*\).*|-\1|g"` 11 7899 dave +moz_contentlocale=`echo $LANG | sed "s|.*_\([^.@]*\).*|\1|g"` 12 7899 dave + 13 7899 dave pass_arg_count=0 14 7899 dave while [ $# -gt $pass_arg_count ] 15 7899 dave do 16 7899 dave @@ -161,6 +167,14 @@ 17 7899 dave script_args="$script_args -d $2" 18 7899 dave shift 2 19 7899 dave ;; 20 7899 dave + -UILocale) 21 7899 dave + moz_uilocale="$2" 22 7899 dave + shift 2 23 7899 dave + ;; 24 7899 dave + -contentLocale) 25 7899 dave + moz_contentlocale="$2" 26 7899 dave + shift 2 27 7899 dave + ;; 28 7899 dave *) 29 7899 dave # Move the unrecognized argument to the end of the list. 30 7899 dave arg="$1" 31 7899 dave @@ -171,6 +185,8 @@ 32 7899 dave esac 33 7899 dave done 34 7899 dave 35 7899 dave +locale_args="-UILocale $moz_uilocale -contentLocale $moz_contentlocale" 36 7899 dave + 37 7899 dave export MRE_HOME 38 7899 dave 39 7899 dave ## Start addon scripts 40 7899 dave @@ -184,9 +200,9 @@ 41 7899 dave 42 7899 dave if [ $debugging = 1 ] 43 7899 dave then 44 7899 dave - echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" 45 7899 dave + echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $locale_args "$@" 46 7899 dave fi 47 7899 dave -"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" 48 7899 dave +"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $locale_args "$@" 49 7899 dave exitcode=$? 50 7899 dave 51 7899 dave ## Stop addon scripts 52