diff --git a/_build/properties/properties.formitcountryoptions.php b/_build/properties/properties.formitcountryoptions.php index abd2ad22..713831fd 100644 --- a/_build/properties/properties.formitcountryoptions.php +++ b/_build/properties/properties.formitcountryoptions.php @@ -98,6 +98,14 @@ 'value' => '', 'lexicon' => 'formit:properties', ), + array( + 'name' => 'country', + 'desc' => 'prop_fico.country_desc', + 'type' => 'textfield', + 'options' => '', + 'value' => '[[++cultureKey]]', + 'lexicon' => 'formit:properties', + ), ); return $properties; \ No newline at end of file diff --git a/_build/properties/properties.formitstateoptions.php b/_build/properties/properties.formitstateoptions.php index ad5b3493..cabf11ce 100644 --- a/_build/properties/properties.formitstateoptions.php +++ b/_build/properties/properties.formitstateoptions.php @@ -63,7 +63,7 @@ 'desc' => 'prop_fiso.country_desc', 'type' => 'textfield', 'options' => '', - 'value' => 'us', + 'value' => '[[++cultureKey]]', 'lexicon' => 'formit:properties', ), array( diff --git a/core/components/formit/elements/snippets/snippet.formitischecked.php b/core/components/formit/elements/snippets/snippet.formitischecked.php index 8c42798c..7e0097f2 100644 --- a/core/components/formit/elements/snippets/snippet.formitischecked.php +++ b/core/components/formit/elements/snippets/snippet.formitischecked.php @@ -31,7 +31,7 @@ $output = ' checked="checked"'; } $input = $modx->fromJSON($input); -if (in_array($options,$input)) { +if (!empty($input) && is_array($input) && in_array($options,$input)) { $output = ' checked="checked"'; } return $output; diff --git a/core/components/formit/elements/snippets/snippet.formitisselected.php b/core/components/formit/elements/snippets/snippet.formitisselected.php index 2cfd4a1e..e23ed0a9 100644 --- a/core/components/formit/elements/snippets/snippet.formitisselected.php +++ b/core/components/formit/elements/snippets/snippet.formitisselected.php @@ -31,7 +31,9 @@ $output = ' selected="selected"'; } $input = $modx->fromJSON($input); -if (in_array($options,$input)) { - $output = ' selected="selected"'; +if(is_array($input)){ + if (in_array($options,$input)) { + $output = ' selected="selected"'; + } } return $output; diff --git a/core/components/formit/elements/snippets/snippet.formitstateoptions.php b/core/components/formit/elements/snippets/snippet.formitstateoptions.php index f2add907..42328734 100644 --- a/core/components/formit/elements/snippets/snippet.formitstateoptions.php +++ b/core/components/formit/elements/snippets/snippet.formitstateoptions.php @@ -27,9 +27,9 @@ require_once $modx->getOption('formit.core_path',null,$modx->getOption('core_path').'components/formit/').'model/formit/formit.class.php'; $fi = new FormIt($modx,$scriptProperties); -/** @var fiCountryOptions $co */ -$co = $fi->loadModule('fiStateOptions','stateOptions',$scriptProperties); -$co->initialize(); -$co->getData(); -$co->iterate(); -return $co->output(); \ No newline at end of file +/** @var fiStateOptions $so */ +$so = $fi->loadModule('fiStateOptions','stateOptions',$scriptProperties); +$so->initialize(); +$so->getData(); +$so->iterate(); +return $so->output(); \ No newline at end of file diff --git a/core/components/formit/includes/de.countries.inc.php b/core/components/formit/includes/de.countries.inc.php new file mode 100644 index 00000000..a1674e60 --- /dev/null +++ b/core/components/formit/includes/de.countries.inc.php @@ -0,0 +1,267 @@ + + * + * FormIt is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * FormIt is distributed in the hope that it will be useful, but WITHOUT ANY + * 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 + * FormIt; if not, write to the Free Software Foundation, Inc., 59 Temple Place, + * Suite 330, Boston, MA 02111-1307 USA + * + * @package formit + */ +/** + * Array of countries + * @package formit + * @author Erhard Maria Klein at weitblick.net + */ +return array( + 'AF' => 'Afghanistan', + 'EG' => 'Ägypten', + 'AL' => 'Albanien', + 'DZ' => 'Algerien', + 'AS' => 'Amerikanisch-Samoa', + 'VI' => 'Amerikanische Jungferninseln', + 'AD' => 'Andorra', + 'AO' => 'Angola', + 'AI' => 'Anguilla', + 'AQ' => 'Antarktis', + 'AG' => 'Antigua und Barbuda', + 'GQ' => 'Äquatorialguinea', + 'AR' => 'Argentinien', + 'AM' => 'Armenien', + 'AW' => 'Aruba', + 'AZ' => 'Aserbaidschan', + 'ET' => 'Äthiopien', + 'AU' => 'Australien', + 'BS' => 'Bahamas', + 'BH' => 'Bahrain', + 'BD' => 'Bangladesch', + 'BB' => 'Barbados', + 'BE' => 'Belgien', + 'BZ' => 'Belize', + 'BJ' => 'Benin', + 'BM' => 'Bermuda', + 'BT' => 'Bhutan', + 'BO' => 'Bolivien', + 'BA' => 'Bosnien-Herzegowina', + 'BW' => 'Botsuana', + 'BV' => 'Bouvetinsel', + 'BR' => 'Brasilien', + 'VG' => 'Britische Jungferninseln', + 'IO' => 'Britisches Territorium im Indischen Ozean', + 'BN' => 'Brunei', + 'BG' => 'Bulgarien', + 'BF' => 'Burkina Faso', + 'BI' => 'Burundi', + 'CL' => 'Chile', + 'CK' => 'Cookinseln', + 'CR' => 'Costa Rica', + 'DK' => 'Dänemark', + 'EH' => 'Demokratische Arabische Republik Sahara', + 'CD' => 'Demokratische Republik Kongo', + 'KP' => 'Demokratische Volksrepublik Korea', + 'DE' => 'Deutschland', + 'DM' => 'Dominica', + 'DO' => 'Dominikanische Republik', + 'DJ' => 'Dschibuti', + 'EC' => 'Ecuador', + 'SV' => 'El Salvador', + 'CI' => 'Elfenbeinküste', + 'ER' => 'Eritrea', + 'EE' => 'Estland', + 'FK' => 'Falkland Inseln', + 'FO' => 'Färöer', + 'FJ' => 'Fidschi', + 'FI' => 'Finnland', + 'FR' => 'Frankreich', + 'GF' => 'Französisch Guyana', + 'PF' => 'Französisch-Polynesien', + 'TF' => 'Französische Süd- und Antarktisgebiete', + 'GA' => 'Gabun', + 'GM' => 'Gambia', + 'GE' => 'Georgien', + 'GH' => 'Ghana', + 'GI' => 'Gibraltar', + 'GD' => 'Grenada', + 'GR' => 'Griechenland', + 'GL' => 'Grönland', + 'GB' => 'Großbritannien und Nordirland', + 'GP' => 'Guadeloupe', + 'GU' => 'Guam', + 'GT' => 'Guatemala', + 'GN' => 'Guinea', + 'GW' => 'Guinea-Bissau', + 'GY' => 'Guyana', + 'HT' => 'Haiti', + 'HM' => 'Heard-Insel', + 'HN' => 'Honduras', + 'HK' => 'Hongkong', + 'IN' => 'Indien', + 'ID' => 'Indonesien', + 'IQ' => 'Irak', + 'IR' => 'Iran', + 'IE' => 'Irland', + 'IS' => 'Island', + 'IL' => 'Israel', + 'IT' => 'Italien', + 'JM' => 'Jamaika', + 'JP' => 'Japan', + 'YE' => 'Jemen', + 'JO' => 'Jordanien', + 'KY' => 'Kaimaninseln', + 'KH' => 'Kambodscha', + 'CM' => 'Kamerun', + 'CA' => 'Kanada', + 'CV' => 'Kap Verde', + 'KZ' => 'Kasachstan', + 'QA' => 'Katar', + 'KE' => 'Kenia', + 'KG' => 'Kirgisistan', + 'KI' => 'Kiribati', + 'CC' => 'Kokos- bzw. Keelinginseln', + 'CO' => 'Kolumbien', + 'KM' => 'Komoren', + 'HR' => 'Kroatien', + 'CU' => 'Kuba', + 'KW' => 'Kuwait', + 'LA' => 'Laos', + 'LS' => 'Lesotho', + 'LV' => 'Lettland', + 'LB' => 'Libanon', + 'LR' => 'Liberia', + 'LY' => 'Libyen', + 'LI' => 'Liechtenstein', + 'LT' => 'Litauen', + 'LU' => 'Luxemburg', + 'MO' => 'Macau', + 'MG' => 'Madagaskar', + 'MW' => 'Malawi', + 'MY' => 'Malaysia', + 'MV' => 'Malediven', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MA' => 'Marokko', + 'MH' => 'Marshallinseln', + 'MQ' => 'Martinique', + 'MR' => 'Mauretanien', + 'MU' => 'Mauritius', + 'YT' => 'Mayotte', + 'MK' => 'Mazedonien', + 'MX' => 'Mexiko', + 'FM' => 'Mikronesien', + 'MC' => 'Monaco', + 'MN' => 'Mongolei', + 'MS' => 'Montserrat', + 'MZ' => 'Mosambik', + 'MM' => 'Myanmar', + 'NA' => 'Namibia', + 'NR' => 'Nauru', + 'NP' => 'Nepal', + 'NC' => 'Neukaledonien', + 'NZ' => 'Neuseeland', + 'NI' => 'Nicaragua', + 'NL' => 'Niederlande', + 'AN' => 'Niederländische Antillen', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NU' => 'Niue', + 'MP' => 'Nördliche Marianen', + 'NF' => 'Norfolkinsel', + 'NO' => 'Norwegen', + 'OM' => 'Oman', + 'TP' => 'Ost-Timor', + 'AT' => 'Österreich', + 'PK' => 'Pakistan', + 'PS' => 'Palästina', + 'PW' => 'Palau', + 'PA' => 'Panama', + 'PG' => 'Papua-Neuguinea', + 'PY' => 'Paraguay', + 'PE' => 'Peru', + 'PH' => 'Philippinen', + 'PN' => 'Pitcairninseln', + 'PL' => 'Polen', + 'PT' => 'Portugal', + 'PR' => 'Puerto Rico', + 'TW' => 'Republik China (Taiwan)', + 'CG' => 'Republik Kongo', + 'KR' => 'Republik Korea', + 'MD' => 'Republik Moldau', + 'RE' => 'Réunion', + 'RW' => 'Ruanda', + 'RO' => 'Rumänien', + 'RU' => 'Russische Föderation', + 'PM' => 'Saint Pierre und Miquelon', + 'SB' => 'Salomonen', + 'ZM' => 'Sambia', + 'WS' => 'Samoa', + 'SM' => 'San Marino', + 'ST' => 'Sao Tomé und Príncipe', + 'SA' => 'Saudi-Arabien', + 'SE' => 'Schweden', + 'CH' => 'Schweiz', + 'SN' => 'Senegal', + 'CS' => 'Serbien und Montenegro', + 'SC' => 'Seychellen', + 'SL' => 'Sierra Leone', + 'ZW' => 'Simbabwe', + 'SG' => 'Singapur', + 'SK' => 'Slowakei', + 'SI' => 'Slowenien', + 'SO' => 'Somalia', + 'ES' => 'Spanien', + 'SJ' => 'Spitzbergen und Jan Mayen Inseln', + 'LK' => 'Sri Lanka', + 'SH' => 'St. Helena', + 'KN' => 'St. Kitts und Nevis', + 'LC' => 'St. Lucia', + 'VC' => 'St. Vincent und die Grenadinen', + 'GS' => 'Süd-Georgien und Südliche Sandwichinseln', + 'ZA' => 'Südafrika', + 'SD' => 'Sudan', + 'SR' => 'Suriname', + 'SZ' => 'Swasiland', + 'SY' => 'Syrien', + 'TJ' => 'Tadschikistan', + 'TZ' => 'Tansania', + 'TH' => 'Thailand', + 'TG' => 'Togo', + 'TK' => 'Tokelau', + 'TO' => 'Tonga', + 'TT' => 'Trinidad und Tobago', + 'TD' => 'Tschad', + 'CZ' => 'Tschechische Republik', + 'TN' => 'Tunesien', + 'TR' => 'Türkei', + 'TM' => 'Turkmenistan', + 'TC' => 'Turks- und Caicosinseln', + 'TV' => 'Tuvalu', + 'UG' => 'Uganda', + 'UA' => 'Ukraine', + 'HU' => 'Ungarn', + 'UY' => 'Uruguay', + 'UZ' => 'Usbekistan', + 'VU' => 'Vanuatu', + 'VA' => 'Vatikanstadt', + 'VE' => 'Venezuela', + 'AE' => 'Vereinigte Arabische Emirate', + 'US' => 'Vereinigte Staaten von Amerika', + 'VN' => 'Vietnam', + 'CN' => 'Volksrepublik China', + 'WF' => 'Wallis und Futuna', + 'CX' => 'Weihnachtsinsel', + 'BY' => 'Weißrußland', + 'CF' => 'Zentralafrikanische Republik', + 'UM' => 'zur USA gehörende Inseln', + 'CY' => 'Zypern' +); diff --git a/core/components/formit/includes/sv.countries.inc.php b/core/components/formit/includes/sv.countries.inc.php new file mode 100644 index 00000000..bbe4cc45 --- /dev/null +++ b/core/components/formit/includes/sv.countries.inc.php @@ -0,0 +1,277 @@ + + * + * FormIt is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * FormIt is distributed in the hope that it will be useful, but WITHOUT ANY + * 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 + * FormIt; if not, write to the Free Software Foundation, Inc., 59 Temple Place, + * Suite 330, Boston, MA 02111-1307 USA + * + * @package formit + */ +/** + * Array of countries in Swedish + * Source for country codes: http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm (2013-06-23) + * @package formit + */ +return array( + 'AF' => 'Afghanistan', + 'AL' => 'Albanien', + 'DZ' => 'Algeriet', + 'VI' => 'Amerikanska Jungfruöarna', + 'AS' => 'Amerikanska Samoa', + 'AD' => 'Andorra', + 'AO' => 'Angola', + 'AI' => 'Anguilla', + 'AQ' => 'Antarktis', + 'AG' => 'Antigua och Barbuda', + 'AR' => 'Argentina', + 'AM' => 'Armenien', + 'AW' => 'Aruba', + 'AU' => 'Australien', + 'AZ' => 'Azerbajdzjan', + 'BS' => 'Bahamas', + 'BH' => 'Bahrain', + 'BD' => 'Bangladesh', + 'BB' => 'Barbados', + 'BE' => 'Belgien', + 'BZ' => 'Belize', + 'BJ' => 'Benin', + 'BM' => 'Bermuda', + 'BT' => 'Bhutan', + 'BO' => 'Bolivia, Mångnationella staten', + 'BQ' => 'Bonaire, Sint Eustatius och Saba', + 'BA' => 'Bosnien-Hercegovina', + 'BW' => 'Botswana', + 'BV' => 'Bouvetön', + 'BR' => 'Brasilien', + 'VG' => 'Brittiska Jungfruöarna', + 'IO' => 'Brittiska territoriet i Indiska oceanen', + 'BN' => 'Brunei Darussalam', + 'BG' => 'Bulgarien', + 'BF' => 'Burkina Faso', + 'BI' => 'Burundi', + 'KY' => 'Caymanöarna', + 'CF' => 'Centralafrikanska republiken', + 'TD' => 'Chad', + 'CL' => 'Chile', + 'CO' => 'Colombia', + 'KM' => 'Comoros', + 'CK' => 'Cooköarna', + 'CR' => 'Costa Rica', + 'CW' => 'Curaçao', + 'CY' => 'Cypern', + 'DK' => 'Danmark', + 'DJ' => 'Djibouti', + 'DM' => 'Dominica', + 'DO' => 'Dominikanska republiken', + 'EC' => 'Ecuador', + 'EG' => 'Egypten', + 'GQ' => 'Ekvatorialguinea', + 'SV' => 'El Salvador', + 'CI' => 'Elfenbenskusten', + 'ER' => 'Eritrea', + 'EE' => 'Estland', + 'ET' => 'Etiopien', + 'FK' => 'Falklandsöarna', + 'FJ' => 'Fiji', + 'PH' => 'Filippinerna', + 'FI' => 'Finland', + 'FR' => 'Frankrike', + 'GF' => 'Franska Guyana', + 'PF' => 'Franska Polynesien', + 'TF' => 'Franska syd- och Antarktisterritorier', + 'FO' => 'Färöarna', + 'AE' => 'Förenade arabemiraten', + 'UM' => 'Förenta staternas avlägset belägna öar', + 'GA' => 'Gabon', + 'GM' => 'Gambia', + 'GE' => 'Georgien', + 'GH' => 'Ghana', + 'GI' => 'Gibraltar', + 'GR' => 'Grekland', + 'GD' => 'Grenada', + 'GL' => 'Grönland', + 'GP' => 'Guadeloupe', + 'GU' => 'Guam', + 'GT' => 'Guatemala', + 'GG' => 'Guernsey', + 'GN' => 'Guinea', + 'GW' => 'Guinea-Bissau', + 'GY' => 'Guyana', + 'HT' => 'Haiti', + 'HM' => 'Heardön och McDonaldsöarna', + 'HN' => 'Honduras', + 'HK' => 'Hong Kong', + 'IN' => 'Indien', + 'ID' => 'Indonesien', + 'IQ' => 'Irak', + 'IR' => 'Iran, Islamiska republiken', + 'IE' => 'Irland', + 'IS' => 'Island', + 'IM' => 'Isle of Man', + 'IL' => 'Israel', + 'IT' => 'Italien', + 'JM' => 'Jamaica', + 'JP' => 'Japan', + 'JE' => 'Jersey', + 'JO' => 'Jordanien', + 'CX' => 'Julön', + 'KH' => 'Kambodja', + 'CM' => 'Kamerun', + 'CA' => 'Kanada', + 'CV' => 'Kap Verde', + 'KZ' => 'Kazakstan', + 'KE' => 'Kenya', + 'CN' => 'Kina', + 'KG' => 'Kirgizistan', + 'KI' => 'Kiribati', + 'CC' => 'Kokosöarna', + 'CD' => 'Kongo, Demokratiska republiken', + 'CG' => 'Kongo, Republiken', + 'KP' => 'Korea, Demokratiska folkrepubliken', + 'KR' => 'Korea, Republiken', + 'HR' => 'Kroatien', + 'CU' => 'Kuba', + 'KW' => 'Kuwait', + 'LA' => 'Laos, Demokratiska folkrepubliken', + 'LS' => 'Lesotho', + 'LV' => 'Lettland', + 'LB' => 'Libanon', + 'LR' => 'Liberia', + 'LY' => 'Libyen', + 'LI' => 'Liechtenstein', + 'LT' => 'Litauen', + 'LU' => 'Luxemburg', + 'MO' => 'Macao', + 'MG' => 'Madagaskar', + 'MK' => 'Makedonien, Republiken', + 'MW' => 'Malawi', + 'MY' => 'Malaysia', + 'MV' => 'Maldiverna', + 'ML' => 'Mali', + 'MT' => 'Malta', + 'MA' => 'Marocko', + 'MH' => 'Marshallöarna', + 'MQ' => 'Martinique', + 'MR' => 'Mauretanien', + 'MU' => 'Mauritius', + 'YT' => 'Mayotte', + 'MX' => 'Mexiko', + 'FM' => 'Mikronesiska federationen', + 'MD' => 'Moldavien, Republiken', + 'MC' => 'Monaco', + 'MN' => 'Mongoliet', + 'ME' => 'Montenegro', + 'MS' => 'Montserrat', + 'MZ' => 'Mozambique', + 'MM' => 'Myanmar', + 'NA' => 'Namibia', + 'NR' => 'Nauru', + 'NL' => 'Nederländerna', + 'NP' => 'Nepal', + 'NI' => 'Nicaragua', + 'NE' => 'Niger', + 'NG' => 'Nigeria', + 'NU' => 'Niue', + 'MP' => 'Nordmarianerna', + 'NF' => 'Norfolk Island', + 'NO' => 'Norge', + 'NC' => 'Nya Kaledonien', + 'NZ' => 'Nya Zeeland', + 'OM' => 'Oman', + 'PK' => 'Pakistan', + 'PW' => 'Palau', + 'PS' => 'Palestina', + 'PA' => 'Panama', + 'PG' => 'Papua Nya Guinea', + 'PY' => 'Paraguay', + 'PE' => 'Peru', + 'PN' => 'Pitcairn', + 'PL' => 'Polen', + 'PT' => 'Portugal', + 'PR' => 'Puerto Rico', + 'QA' => 'Qatar', + 'RE' => 'Reunion', + 'RO' => 'Rumänien', + 'RW' => 'Rwanda', + 'RU' => 'Ryska federationen', + 'BL' => 'Saint Barthélemy', + 'SH' => 'Saint Helena, Ascension och Tristan da Cunha', + 'KN' => 'Saint Kitts och Nevis', + 'LC' => 'Saint Lucia', + 'MF' => 'Saint Martin (Franska delen)', + 'VC' => 'Saint Vincent och Grenadinerna', + 'PM' => 'Saint-Pierre och Miquelon', + 'SB' => 'Salomonöarna', + 'WS' => 'Samoa', + 'SM' => 'San Marino', + 'ST' => 'Sao Tome och Principe', + 'SA' => 'Saudiarabien', + 'CH' => 'Schweiz', + 'SN' => 'Senegal', + 'RS' => 'Serbien', + 'SC' => 'Seychellerna', + 'SL' => 'Sierra Leone', + 'SG' => 'Singapore', + 'SX' => 'Sint Maarten (nederländska delen)', + 'SK' => 'Slovakien', + 'SI' => 'Slovenien', + 'SO' => 'Somalia', + 'ES' => 'Spanien', + 'LK' => 'Sri Lanka', + 'GB' => 'Storbritannien', + 'SD' => 'Sudan', + 'SR' => 'Surinam', + 'SJ' => 'Svalbard och Jan Mayen', + 'SZ' => 'Swaziland', + 'SE' => 'Sverige', + 'ZA' => 'Sydafrika', + 'GS' => 'Sydgeorgien och Sydsandwichöarna', + 'SS' => 'Sydsudan', + 'SY' => 'Syrien, Arabrepubliken', + 'TJ' => 'Tadzjikistan', + 'TW' => 'Taiwan', + 'TZ' => 'Tanzania, Förenade republiken', + 'TH' => 'Thailand', + 'CZ' => 'Tjeckien, Republiken', + 'TG' => 'Togo', + 'TK' => 'Tokelauöarna', + 'TO' => 'Tonga', + 'TT' => 'Trinidad och Tobago', + 'TN' => 'Tunisien', + 'TR' => 'Turkiet', + 'TM' => 'Turkmenistan', + 'TC' => 'Turks- och Caicosöarna', + 'TV' => 'Tuvalu', + 'DE' => 'Tyskland', + 'UG' => 'Uganda', + 'UA' => 'Ukraina', + 'HU' => 'Ungern', + 'UY' => 'Uruguay', + 'US' => 'USA', + 'UZ' => 'Uzbekistan', + 'WF' => 'Wallis- och Futunaöarna', + 'VU' => 'Vanuatu', + 'VA' => 'Vatikanstaten', + 'VE' => 'Venezuela, Bolivarianska republiken', + 'VN' => 'Vietnam', + 'BY' => 'Vitryssland', + 'EH' => 'Västsahara', + 'YE' => 'Yemen', + 'ZM' => 'Zambia', + 'ZW' => 'Zimbabwe', + 'AX' => 'Åland', + 'AT' => 'Österrike', + 'TL' => 'Östtimor' +); \ No newline at end of file diff --git a/core/components/formit/includes/sv.states.inc.php b/core/components/formit/includes/sv.states.inc.php new file mode 100644 index 00000000..1f7040df --- /dev/null +++ b/core/components/formit/includes/sv.states.inc.php @@ -0,0 +1,48 @@ + +* +* FormIt is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the Free +* Software Foundation; either version 2 of the License, or (at your option) any +* later version. +* +* FormIt is distributed in the hope that it will be useful, but WITHOUT ANY +* 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 +* FormIt; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +* Suite 330, Boston, MA 02111-1307 USA +* +* @package formit +*/ +/** +* Array of Swedish states (län) +* @package formit +*/ +return array( + 'K' => 'Blekinge län', + 'W' => 'Dalarnas län', + 'I' => 'Gotlands län', + 'X' => 'Gävleborgs län', + 'N' => 'Hallands län', + 'Z' => 'Jämtlands län', + 'F' => 'Jönköpings län', + 'H' => 'Kalmar län', + 'G' => 'Kronobergs län', + 'BD' => 'Norrbottens län', + 'M' => 'Skåne län', + 'AB' => 'Stockholms län', + 'D' => 'Södermanlands län', + 'C' => 'Uppsala län', + 'S' => 'Värmlands län', + 'AC' => 'Västerbottens län', + 'Y' => 'Västernorrlands län', + 'U' => 'Västmanlands län', + 'O' => 'Västra Götalands län', + 'T' => 'Örebro län', + 'E' => 'Östergötlands län', +); \ No newline at end of file diff --git a/core/components/formit/lexicon/en/properties.inc.php b/core/components/formit/lexicon/en/properties.inc.php index 5316868a..a2b1e9c5 100644 --- a/core/components/formit/lexicon/en/properties.inc.php +++ b/core/components/formit/lexicon/en/properties.inc.php @@ -105,6 +105,7 @@ $_lang['prop_fico.toplaceholder_desc'] = 'Optional. Use this to set the output to a placeholder instead of outputting directly.'; $_lang['prop_fico.tpl_desc'] = 'Optional. The chunk to use for each country dropdown option.'; $_lang['prop_fico.useisocode_desc'] = 'If 1, will use the ISO country code for the value. If 0, will use the country name.'; +$_lang['prop_fico.country_desc'] = 'Optional. Set to use a different countries file when loading a list of countries.'; /* FormItStateOptions properties */ $_lang['prop_fiso.country_desc'] = 'Optional. Set to use a different states file when loading a list of states.'; diff --git a/core/components/formit/lexicon/pl/default.inc.php b/core/components/formit/lexicon/pl/default.inc.php new file mode 100644 index 00000000..872c27e2 --- /dev/null +++ b/core/components/formit/lexicon/pl/default.inc.php @@ -0,0 +1,55 @@ + + * + * FormIt is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * FormIt is distributed in the hope that it will be useful, but WITHOUT ANY + * 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 + * FormIt; if not, write to the Free Software Foundation, Inc., 59 Temple Place, + * Suite 330, Boston, MA 02111-1307 USA + * + * @package formit + */ +/** + * Default Lexicon Topic + * + * @package formit + * @subpackage lexicon + */ +$_lang['formit.all_group_text'] = 'Wszystkie kraje'; +$_lang['formit.contains'] = 'Wartość musi zawierać "[[+value]]".'; +$_lang['formit.email_invalid'] = 'Wprowadź poprawny adres email.'; +$_lang['formit.email_invalid_domain'] = 'Email musi być w istniejącej domenie.'; +$_lang['formit.email_no_recipient'] = 'Wpisz odbiorcę lub odbiorców tej wiadomości.'; +$_lang['formit.email_not_sent'] = 'Wystąpił błąd przy wysyłaniu wiadomości.'; +$_lang['formit.email_tpl_nf'] = 'Wybierz szablon wiadomości.'; +$_lang['formit.field_not_empty'] = 'Pole nie może być puste.'; +$_lang['formit.field_required'] = 'Pole jest wymagane.'; +$_lang['formit.math_incorrect'] = 'Zła odpowiedź!'; +$_lang['formit.math_field_nf'] = 'Pole [[+field]] nie istnieje w formularzu.'; +$_lang['formit.max_length'] = 'Treść nie może być dłuższa niż [[+length]] znaków.'; +$_lang['formit.max_value'] = 'Wartość nie może być większa niż [[+value]].'; +$_lang['formit.min_length'] = 'Treść musi zawierać przynajmniej [[+length]] znaków.'; +$_lang['formit.min_value'] = 'Wartość nie może być mniejsza niż [[+value]].'; +$_lang['formit.not_date'] = 'Wpisz poprawną datę.'; +$_lang['formit.not_lowercase'] = 'Pole może zawierać tylko małe litery.'; +$_lang['formit.not_number'] = 'Pole musi zawierać liczbę.'; +$_lang['formit.not_uppercase'] = 'Pole może zawierać tylko wielkie litery.'; +$_lang['formit.password_dont_match'] = 'Hasła nie są takie same.'; +$_lang['formit.password_not_confirmed'] = 'Wpisz potwierdzenie hasła.'; +$_lang['formit.prioritized_group_text'] = 'Frequent Visitors'; +$_lang['formit.range_invalid'] = 'Niepoprawny zakres.'; +$_lang['formit.range'] = 'Wartość musi zawierać się pomiędzy [[+min]] i [[+max]].'; +$_lang['formit.recaptcha_err_load'] = 'Nie można załadować klasy FormItReCaptcha.'; +$_lang['formit.spam_blocked'] = 'Twój formularz został zablokowany przez filtr samu: '; +$_lang['formit.spam_marked'] = ' - oznaczone jako spam.'; +$_lang['formit.username_taken'] = 'Nazwa użytkownika już zajęta. Wybierz inną.'; \ No newline at end of file diff --git a/core/components/formit/lexicon/pl/recaptcha.inc.php b/core/components/formit/lexicon/pl/recaptcha.inc.php new file mode 100644 index 00000000..9ebd1902 --- /dev/null +++ b/core/components/formit/lexicon/pl/recaptcha.inc.php @@ -0,0 +1,34 @@ + + * + * FormIt is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) any + * later version. + * + * FormIt is distributed in the hope that it will be useful, but WITHOUT ANY + * 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 + * FormIt; if not, write to the Free Software Foundation, Inc., 59 Temple Place, + * Suite 330, Boston, MA 02111-1307 USA + * + * @package formit + */ +/** + * reCaptcha Lexicon Topic + * + * @package formit + * @subpackage lexicon + */ +$_lang['recaptcha.empty_answer'] = 'Niepoprawne słowa captcha. Sprawdź swoją odpowiedź i spróbuj jeszcze raz.'; +$_lang['recaptcha.incorrect'] = 'Niepoprawne słowa captcha. Sprawdź swoją odpowiedź i spróbuj jeszcze raz. [[+error]]'; +$_lang['recaptcha.mailhide_no_mcrypt'] = 'Jeśli chcesz używać reCAPTCHA Mailhide, musisz mieć zainstalowany moduł mcrypt w php.'; +$_lang['recaptcha.mailhide_no_api_key'] = 'Jeśli chcesz używać reCAPTCHA Mailhide, musisz się zarejestrować i pobrać klucz prywatny i publiczny. Możesz to zrobić pod adresem http://www.google.com/recaptcha'; +$_lang['recaptcha.no_api_key'] = 'Do używania reCAPTCHA musisz pobrać klucz API pod adresem http://www.google.com/recaptcha'; +$_lang['recaptcha.no_remote_ip'] = 'Ze względów bezpieczeństwa, należy wysłać zdalny adres ip do reCAPTCHA'; + diff --git a/core/components/formit/model/formit/module/ficountryoptions.class.php b/core/components/formit/model/formit/module/ficountryoptions.class.php index 80ba5bbb..889c3e53 100644 --- a/core/components/formit/model/formit/module/ficountryoptions.class.php +++ b/core/components/formit/model/formit/module/ficountryoptions.class.php @@ -51,6 +51,7 @@ public function initialize() { 'allGroupText' => '', 'outputSeparator' => "\n", 'toPlaceholder' => '', + 'country' => $this->modx->getOption('cultureKey', array(), 'us', true), )); $this->setOption('selectedKey',$this->getOption('useIsoCode',true,'isset') ? 'countryKey' : 'countryName'); } @@ -60,8 +61,8 @@ public function initialize() { * @return array */ public function getData() { - $cultureKey = $this->modx->getOption('cultureKey', array(), '', true); - $countriesFile = $this->getOption('countriesDirectory',$this->formit->config['includesPath']).$cultureKey.'.countries.inc.php'; + $country = $this->getOption('country','us'); + $countriesFile = $this->getOption('countriesDirectory',$this->formit->config['includesPath']).$country.'.countries.inc.php'; if (file_exists($countriesFile)) { $this->countries = include $countriesFile; } else { diff --git a/core/components/formit/model/formit/module/fistateoptions.class.php b/core/components/formit/model/formit/module/fistateoptions.class.php index 9cd8c8a1..225bf6b2 100644 --- a/core/components/formit/model/formit/module/fistateoptions.class.php +++ b/core/components/formit/model/formit/module/fistateoptions.class.php @@ -43,7 +43,7 @@ public function initialize() { 'selectedAttribute' => ' selected="selected"', 'outputSeparator' => "\n", 'toPlaceholder' => '', - 'country' => 'us', + 'country' => $this->modx->getOption('cultureKey', array(), 'us', true), )); $this->setOption('selectedKey',$this->getOption('useAbbr',true) ? 'stateKey' : 'stateName'); } @@ -54,13 +54,13 @@ public function initialize() { */ public function getData() { $country = $this->getOption('country','us'); - $statesFile = $this->getOption('statesDirectory',$this->formit->config['includesPath']).$country.'.states.inc.php'; - if (file_exists($statesFile)) { - $this->states = include $statesFile; - } else { - $this->states = include $this->formit->config['includesPath'].'us.states.inc.php'; - } - return $this->states; + $statesFile = $this->getOption('statesDirectory',$this->formit->config['includesPath']).$country.'.states.inc.php'; + if (file_exists($statesFile)) { + $this->states = include $statesFile; + } else { + $this->states = include $this->formit->config['includesPath'].'us.states.inc.php'; + } + return $this->states; } /** diff --git a/readme.md b/readme.md index 5940395b..f5b71347 100644 --- a/readme.md +++ b/readme.md @@ -1 +1,3 @@ -# FormIt \ No newline at end of file +# FormIt + +FormIt is currently maintained at [modxcms/FormIt](http://github.com/modxcms/FormIt). Please [go there](http://github.com/modxcms/FormIt).