From: Michael J. Rubinsky Date: Wed, 3 Feb 2010 22:00:04 +0000 (-0500) Subject: Horde_NLS => Horde_Nls X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c0221ecd9ac876aeeb84ac9540028928db9db8b5;p=horde.git Horde_NLS => Horde_Nls --- diff --git a/framework/Form/Form/Type.php b/framework/Form/Form/Type.php index 905af4b2e..da419df63 100644 --- a/framework/Form/Form/Type.php +++ b/framework/Form/Form/Type.php @@ -687,14 +687,14 @@ class Horde_Form_Type_address extends Horde_Form_Type_longtext { $info['street'] = $addressParts[1]; } if (!empty($addressParts[2])) { - include 'Horde/NLS/carsigns.php'; + include 'Horde/Nls/Carsigns.php'; $country = array_search(Horde_String::upper($addressParts[2]), $carsigns); if ($country) { $info['country'] = $country; } } if (!empty($addressParts[5])) { - include 'Horde/NLS/countries.php'; + include 'Horde/Nls/Countries.php'; $country = array_search($addressParts[5], $countries); if ($country) { $info['country'] = Horde_String::lower($country); diff --git a/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php b/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php index b13612b75..c4ee80a37 100644 --- a/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php +++ b/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php @@ -1016,7 +1016,7 @@ EOT; } elseif (preg_match('/(.*?)\r?\n([A-Z]{1,3})-(\d{5})\s+(.*)/i', $address, $addressParts)) { /* European address style. */ - include 'Horde/NLS/carsigns.php'; + include 'Horde/Nls/Carsigns.php'; $country = array_search(Horde_String::upper($addressParts[2]), $carsigns); /* Map24 generated map. */ diff --git a/horde/lib/Block/sunrise.php b/horde/lib/Block/sunrise.php index 44a0fc93f..9feec6e7f 100644 --- a/horde/lib/Block/sunrise.php +++ b/horde/lib/Block/sunrise.php @@ -22,7 +22,7 @@ class Horde_Block_Horde_sunrise extends Horde_Block { global $coordinates; if (!is_array($coordinates)) { - include 'Horde/NLS/coordinates.php'; + include 'Horde/Nls/Coordinates.php'; if (!is_array($coordinates)) { $coordinates = array(); } @@ -48,7 +48,7 @@ class Horde_Block_Horde_sunrise extends Horde_Block { $location = ''; global $coordinates; if (!is_array($coordinates)) { - require 'Horde/NLS/coordinates.php'; + require 'Horde/Nls/Coordinates.php'; } foreach ($coordinates as $country) { if (array_key_exists($this->_params['location'], $country)) { diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php index e5b55bc22..417ee2908 100644 --- a/turba/lib/Driver.php +++ b/turba/lib/Driver.php @@ -1974,7 +1974,7 @@ class Turba_Driver $hash[$prefix . 'Address'] .= ' ' . $hash[$prefix . 'PostalCode']; } if (!empty($address[VCARD_ADR_COUNTRY])) { - include 'Horde/NLS/countries.php'; + include 'Horde/Nls/Countries.php'; $country = array_search($address[VCARD_ADR_COUNTRY], $countries); if ($country === false) { $country = $address[VCARD_ADR_COUNTRY];