From 84691404710b8553eaae0937454ef684293d2684 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Sun, 9 May 2010 20:51:01 +0000
Subject: add nl.piwigo.org as domain name if current language is nl_NL

fix typos on language names in install.php

correct list of available newsletters

git-svn-id: http://piwigo.org/svn/trunk@6152 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/functions.php | 3 +++
 include/common.inc.php      | 2 +-
 install.php                 | 7 +++++--
 upgrade.php                 | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/admin/include/functions.php b/admin/include/functions.php
index d6a1d5fee..1d7fda97c 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1868,7 +1868,10 @@ function get_newsletter_subscribe_base_url($language) {
     'it_IT' => 'it.piwigo.org',
     'de_DE' => 'de.piwigo.org',
     'es_ES' => 'es.piwigo.org',
+    'zh_CN' => 'cn.piwigo.org',
     'pl_PL' => 'pl.piwigo.org',
+    'hu_HU' => 'hu.piwigo.org',
+    'ru_RU' => 'ru.piwigo.org',
     );
 
   if (isset($domain_of[$language])) {
diff --git a/include/common.inc.php b/include/common.inc.php
index 0f1160a54..9805bc362 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -122,7 +122,7 @@ load_plugins();
 
 include(PHPWG_ROOT_PATH.'include/user.inc.php');
 
-if (in_array( substr($user['language'],0,2), array('fr','it','de','es','pl','hu','ru') ) )
+if (in_array( substr($user['language'],0,2), array('fr','it','de','es','pl','hu','ru','nl') ) )
 {
   define('PHPWG_DOMAIN', substr($user['language'],0,2).'.piwigo.org');
 }
diff --git a/install.php b/install.php
index 00f1dd04e..56f0654a1 100644
--- a/install.php
+++ b/install.php
@@ -200,12 +200,15 @@ else if ('pl_PL' == $language) {
 else if ('zh_CN' == $language) {
   define('PHPWG_DOMAIN', 'cn.piwigo.org');
 }
-else if ('hu_HU_CN' == $language) {
+else if ('hu_HU' == $language) {
   define('PHPWG_DOMAIN', 'hu.piwigo.org');
 }
-else if ('ru_RU_CN' == $language) {
+else if ('ru_RU' == $language) {
   define('PHPWG_DOMAIN', 'ru.piwigo.org');
 }
+else if ('nl_NL' == $language) {
+  define('PHPWG_DOMAIN', 'nl.piwigo.org');
+}
 else {
   define('PHPWG_DOMAIN', 'piwigo.org');
 }
diff --git a/upgrade.php b/upgrade.php
index 9d8d78ff8..de1f704b4 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -179,6 +179,9 @@ else if ('hu_HU' == $language) {
 else if ('ru_RU' == $language) {
   define('PHPWG_DOMAIN', 'ru.piwigo.org');
 }
+else if ('nl_NL' == $language) {
+  define('PHPWG_DOMAIN', 'nl.piwigo.org');
+}
 else {
   define('PHPWG_DOMAIN', 'piwigo.org');
 }
-- 
cgit v1.2.3