Skip to content

Commit

Permalink
Revert "Languages other than english should manually set the LC_NUMER…
Browse files Browse the repository at this point in the history
…IC locate to en_US otherwise floats may contain commas instead of decimal points (osCommerce#634)"

This reverts commit 1866297.
  • Loading branch information
haraldpdl committed Sep 25, 2013
1 parent 4460076 commit 59e81a0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
12 changes: 5 additions & 7 deletions catalog/admin/includes/languages/english.php
Expand Up @@ -10,13 +10,11 @@
Released under the GNU General Public License
*/

// look in your $PATH_LOCALE/locale directory for available locales
// or type locale -a on the server.
@setlocale(LC_ALL, array('en_US.UTF-8', 'en_US.UTF8', 'enu_usa'));

// other languages should set LC_NUMERIC to en_US otherwise floats may contain commas instead of decimal points (see bug #634)
//@setlocale(LC_NUMERIC, array('en_US.UTF-8', 'en_US.UTF8', 'enu_usa'));

// look in your $PATH_LOCALE/locale directory for available locales..
// on RedHat6.0 I used 'en_US'
// on FreeBSD 4.0 I use 'en_US.ISO_8859-1'
// this may not work under win32 environments..
setlocale(LC_ALL, array('en_US.UTF-8', 'en_US.UTF8', 'enu_usa'));
define('DATE_FORMAT_SHORT', '%m/%d/%Y'); // this is used for strftime()
define('DATE_FORMAT_LONG', '%A %d %B, %Y'); // this is used for strftime()
define('DATE_FORMAT', 'm/d/Y'); // this is used for date()
Expand Down
7 changes: 4 additions & 3 deletions catalog/includes/languages/english.php
Expand Up @@ -12,11 +12,12 @@

// look in your $PATH_LOCALE/locale directory for available locales
// or type locale -a on the server.
// Examples:
// on RedHat try 'en_US'
// on FreeBSD try 'en_US.ISO_8859-1'
// on Windows try 'en', or 'English'
@setlocale(LC_ALL, array('en_US.UTF-8', 'en_US.UTF8', 'enu_usa'));

// other languages should set LC_NUMERIC to en_US otherwise floats may contain commas instead of decimal points (see bug #634)
//@setlocale(LC_NUMERIC, array('en_US.UTF-8', 'en_US.UTF8', 'enu_usa'));

define('DATE_FORMAT_SHORT', '%m/%d/%Y'); // this is used for strftime()
define('DATE_FORMAT_LONG', '%A %d %B, %Y'); // this is used for strftime()
define('DATE_FORMAT', 'm/d/Y'); // this is used for date()
Expand Down

0 comments on commit 59e81a0

Please sign in to comment.