Skip to content
Browse files

merge revision 2286: make talks.languages to include at least the nam…

…e of general.default_language

git-svn-id: svn://svn.mongueurs.net/act/branches/stable@2287 67b57a05-4208-db11-a765-00306e02d86a
  • Loading branch information...
1 parent d4b9e86 commit 0e503edd569007843329158bd5c0d8b18575d96f @maddingue maddingue committed
Showing with 10 additions and 0 deletions.
  1. +10 −0 lib/Act/Config.pm
View
10 lib/Act/Config.pm
@@ -215,6 +215,7 @@ sub load_configs
# talk durations
_make_hash($ConfConfigs{$conf}, talks_durations => $ConfConfigs{$conf}->talks_durations);
+
# talk languages
if ($ConfConfigs{$conf}->talks_languages) {
$ConfConfigs{$conf}->set(
@@ -222,6 +223,15 @@ sub load_configs
split /\s+/, $ConfConfigs{$conf}->talks_languages
});
}
+ else {
+ $ConfConfigs{$conf}->set(
+ talks_languages => {
+ map { $_ => Act::Language::name($_) }
+ split /\s+/, $ConfConfigs{$conf}->general_default_language
+ }
+ );
+ }
+
# room names
my %rooms_names;
_make_hash($ConfConfigs{$conf}, rooms_codes => $ConfConfigs{$conf}->rooms_rooms);

0 comments on commit 0e503ed

Please sign in to comment.
Something went wrong with that request. Please try again.