Skip to content

Use Horde_Nls_Loader to get instead of non-working include #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amulet1 wants to merge 1 commit into
base: FRAMEWORK_6_0
Choose a base branch
from
+6 −4
Open

Use Horde_Nls_Loader to get instead of non-working include #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Horde/Form/Type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,14 +788,14 @@ public function parse($address)
$info['street'] = $addressParts[1];
}
if (!empty($addressParts[2])) {
include 'Horde/Nls/Carsigns.php';
$carsigns = Horde_Nls_Loader::loadCarsigns();
$country = array_search(Horde_String::upper($addressParts[2]), $carsigns);
if ($country) {
$info['country'] = $country;
}
}
if (!empty($addressParts[5])) {
include 'Horde/Nls/Countries.php';
$countries = Horde_Nls_Loader::loadCountries();
$country = array_search($addressParts[5], $countries);
if ($country) {
$info['country'] = Horde_String::lower($country);
Expand Down
5 changes: 3 additions & 2 deletions src/V3/AddressVariable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use Horde_Variables;
use Horde_String;
use Horde_Form_Translation;
use Horde_Nls_Loader;

class AddressVariable extends LongtextVariable
{
Expand Down Expand Up @@ -69,14 +70,14 @@ public function parse($address)
$info['street'] = $addressParts[1];
}
if (!empty($addressParts[2])) {
include 'Horde/Nls/Carsigns.php';
$carsigns = Horde_Nls_Loader::loadCarsigns();
$country = array_search(Horde_String::upper($addressParts[2]), $carsigns);
if ($country) {
$info['country'] = $country;
}
}
if (!empty($addressParts[5])) {
include 'Horde/Nls/Countries.php';
$countries = Horde_Nls_Loader::loadCountries();
$country = array_search($addressParts[5], $countries);
if ($country) {
$info['country'] = Horde_String::lower($country);
Expand Down
1 change: 1 addition & 0 deletions src/V3/NumberVariable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
namespace Horde\Form\V3;
use Horde_Variables;
use Horde_Form_Translation;
use Horde_Nls;

class NumberVariable extends BaseVariable
{
Expand Down
Loading