From fa1024d8c130eee8ff02b2d0a28fd5255279e692 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 15 Apr 2015 16:01:34 -0400 Subject: [PATCH 1/3] Localization --- html/pfappserver/lib/pfappserver/I18N/i_default.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/pfappserver/lib/pfappserver/I18N/i_default.po b/html/pfappserver/lib/pfappserver/I18N/i_default.po index cd19b3ee9572..32447a1f256e 100644 --- a/html/pfappserver/lib/pfappserver/I18N/i_default.po +++ b/html/pfappserver/lib/pfappserver/I18N/i_default.po @@ -5762,7 +5762,7 @@ msgstr "" # pf::pfcmd::report (SQL) # pfappserver::PacketFence::Controller::Graph (osclassbandwidth fields) msgid "dhcp_fingerprint" -msgstr "DHCP Fingerpint" +msgstr "DHCP Fingerprint" # pf::config (VALID_TRIGGER_TYPES) msgid "dhcp_vendor" From d022badcc182bd601445ed3331b7aedf250a75a6 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 15 Apr 2015 16:25:39 -0400 Subject: [PATCH 2/3] Localization --- .../lib/pfappserver/I18N/i_default.po | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/html/pfappserver/lib/pfappserver/I18N/i_default.po b/html/pfappserver/lib/pfappserver/I18N/i_default.po index 32447a1f256e..e486fb7d4c0a 100644 --- a/html/pfappserver/lib/pfappserver/I18N/i_default.po +++ b/html/pfappserver/lib/pfappserver/I18N/i_default.po @@ -4468,7 +4468,7 @@ msgid "" msgstr "" # conf/documentation.conf (billing.mirapay_currency) -msgid "The currency of the mirapay transactions" +msgid "The currency of the MiraPay transactions" msgstr "" # html/pfappserver/root/user/list_password.tt @@ -4480,7 +4480,7 @@ msgid "The following users have been created" msgstr "" # conf/documentation.conf (billing.mirapay_hash_password) -msgid "The hash password for mirapay" +msgid "The hash password for MiraPay" msgstr "" # conf/documentation.conf (provisioning.ssid) @@ -4534,7 +4534,7 @@ msgid "The payment gateway processing URL (Provided by Authorize.net)" msgstr "" # conf/documentation.conf (billing.mirapay_url) -msgid "The payment gateway processing URL for mirapay" +msgid "The payment gateway processing URL for MiraPay" msgstr "" # conf/documentation.conf (billing.gateway) @@ -4564,11 +4564,11 @@ msgid "The rule was not found." msgstr "" # conf/documentation.conf (billing.mirapay_terminal_id) -msgid "The terminal id for mirapay" +msgid "The terminal id for MiraPay" msgstr "" # conf/documentation.conf (billing.mirapay_terminal_id_group) -msgid "The terminal id group for mirapay" +msgid "The terminal id group for MiraPay" msgstr "" # html/pfappserver/lib/pfappserver/Form/User/Create/Single.pm @@ -5534,23 +5534,23 @@ msgstr "Gateway" # conf/documentation.conf msgid "billing.mirapay_currency" -msgstr "Mirapay currency" +msgstr "MiraPay currency" # conf/documentation.conf msgid "billing.mirapay_hash_password" -msgstr "Mirapay password" +msgstr "MiraPay password" # conf/documentation.conf msgid "billing.mirapay_terminal_id" -msgstr "Mirapay terminal id" +msgstr "MiraPay terminal id" # conf/documentation.conf msgid "billing.mirapay_terminal_id_group" -msgstr "Mirapay terminal group id" +msgstr "MiraPay terminal group id" # conf/documentation.conf msgid "billing.mirapay_url" -msgstr "Mirapay URL" +msgstr "MiraPay URL" # html/pfappserver/root/admin/users.tt # pfappserver::Form::Config::ProfileCommon (mandatory fields) @@ -6367,7 +6367,7 @@ msgstr "" # conf/documentation.conf (billing.gateway options) msgid "mirapay" -msgstr "Mirapay" +msgstr "MiraPay" # pf::provisioner (Provisioners) msgid "mobileconfig" From 154fbf9386129180b93801252ab580232f6454e8 Mon Sep 17 00:00:00 2001 From: James Rouzier Date: Wed, 15 Apr 2015 16:28:15 -0400 Subject: [PATCH 3/3] Fix field inheritence --- .../lib/pfappserver/Model/Config/Fingerbank/MAC_Vendor.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/pfappserver/lib/pfappserver/Model/Config/Fingerbank/MAC_Vendor.pm b/html/pfappserver/lib/pfappserver/Model/Config/Fingerbank/MAC_Vendor.pm index 821c390aab78..bfd58f219c86 100644 --- a/html/pfappserver/lib/pfappserver/Model/Config/Fingerbank/MAC_Vendor.pm +++ b/html/pfappserver/lib/pfappserver/Model/Config/Fingerbank/MAC_Vendor.pm @@ -23,7 +23,7 @@ extends 'pfappserver::Base::Model::Fingerbank'; has '+fingerbankModel' => ( default => 'fingerbank::Model::MAC_Vendor'); -has search_fields => ( default => sub { [qw(name mac) ] } ); +has '+search_fields' => ( default => sub { [qw(name mac) ] } ); __PACKAGE__->meta->make_immutable;