Enhancement Bug 4444: Centralize Code Handling Perl Dependencies

[koha_gimpoz] / C4 / Languages.pm

diff --git a/C4/Languages.pm b/C4/Languages.pm
index 971cc96..9ef2439 100644 (file)
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -14,29 +14,32 @@ package C4::Languages;
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict; 
-#use warnings;   #FIXME: turn off warnings before release
+#use warnings; FIXME - Bug 2505
 use Carp;
 use C4::Context;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
 eval {
-    require Memoize::Memcached;
-    import Memoize::Memcached qw(memoize_memcached);
+    my $servers = C4::Context->config('memcached_servers');
+    if ($servers) {
+        require Memoize::Memcached;
+        import Memoize::Memcached qw(memoize_memcached);
  
-    my $memcached = {
-        servers    => [ C4::Context->config('memcached_servers') ],
-        key_prefix => C4::Context->config('memcached_namespace'),
-    };
-
-    memoize_memcached('getTranslatedLanguages', memcached => $memcached, expire_time => 600); #cache for 10 minutes
-    memoize_memcached('getFrameworkLanguages' , memcached => $memcached, expire_time => 600);
-    memoize_memcached('getAllLanguages',        memcached => $memcached, expire_time => 600);
+        my $memcached = {
+            servers    => [ $servers ],
+            key_prefix => C4::Context->config('memcached_namespace') || 'koha',
+        };
+
+        memoize_memcached('getTranslatedLanguages', memcached => $memcached, expire_time => 600); #cache for 10 minutes
+        memoize_memcached('getFrameworkLanguages' , memcached => $memcached, expire_time => 600);
+        memoize_memcached('getAllLanguages',        memcached => $memcached, expire_time => 600);
+    }
 };
 
 BEGIN {
@@ -262,7 +265,7 @@ sub _get_language_dirs {
         next if $lang_string =~/css$/;
         next if $lang_string =~/CVS$/;
         next if $lang_string =~/\.txt$/i;     #Don't read the readme.txt !
-        next if $lang_string =~/img|images|famfam/;
+        next if $lang_string =~/img|images|famfam|sound/;
         push @lang_strings, $lang_string;
     }
         return (@lang_strings);