diff options
| author | fluxgen <fluxgen> | 2003-06-12 14:24:26 (GMT) |
|---|---|---|
| committer | fluxgen <fluxgen> | 2003-06-12 14:24:26 (GMT) |
| commit | 603b784efd1db88ed1432bcd3b149b45d3b51e89 (patch) | |
| tree | 890996326021d073700eff5a05de87fb9f2cbedc /src | |
| parent | 7f78b30cbec528a640f92e40c947687f1a709152 (diff) | |
| download | fluxbox-603b784efd1db88ed1432bcd3b149b45d3b51e89.zip fluxbox-603b784efd1db88ed1432bcd3b149b45d3b51e89.tar.bz2 | |
moved i18n.hh and .cc files to I18n.hh .cc
Diffstat (limited to 'src')
| -rw-r--r-- | src/I18n.cc (renamed from src/i18n.cc) | 11 | ||||
| -rw-r--r-- | src/I18n.hh (renamed from src/i18n.hh) | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/i18n.cc b/src/I18n.cc index 833a094..1d3cf8b 100644 --- a/src/i18n.cc +++ b/src/I18n.cc | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | // i18n.hh for Fluxbox Window Manager | 1 | // I18n.hh for Fluxbox Window Manager |
| 2 | // Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net) | 2 | // Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net) |
| 3 | // | 3 | // |
| 4 | // i18n.cc for Blackbox - an X11 Window manager | 4 | // I18n.cc for Blackbox - an X11 Window manager |
| 5 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) | 5 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) |
| 6 | // | 6 | // |
| 7 | // Permission is hereby granted, free of charge, to any person obtaining a | 7 | // Permission is hereby granted, free of charge, to any person obtaining a |
| @@ -22,14 +22,14 @@ | |||
| 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
| 24 | 24 | ||
| 25 | // $Id: i18n.cc,v 1.10 2003/05/16 00:17:16 fluxgen Exp $ | 25 | // $Id: I18n.cc,v 1.1 2003/06/12 14:24:26 fluxgen Exp $ |
| 26 | 26 | ||
| 27 | //usr GNU extensions | 27 | //usr GNU extensions |
| 28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
| 29 | #define _GNU_SOURCE | 29 | #define _GNU_SOURCE |
| 30 | #endif // _GNU_SOURCE | 30 | #endif // _GNU_SOURCE |
| 31 | 31 | ||
| 32 | #include "i18n.hh" | 32 | #include "I18n.hh" |
| 33 | 33 | ||
| 34 | #include <X11/Xlocale.h> | 34 | #include <X11/Xlocale.h> |
| 35 | 35 | ||
| @@ -72,10 +72,11 @@ I18n::I18n():m_multibyte(false), m_catalog_fd((nl_catd)(-1)) { | |||
| 72 | 72 | ||
| 73 | // truncate any encoding off the end of the locale | 73 | // truncate any encoding off the end of the locale |
| 74 | 74 | ||
| 75 | // remove everything after @ | ||
| 75 | string::size_type index = m_locale.find('@'); | 76 | string::size_type index = m_locale.find('@'); |
| 76 | if (index != string::npos) | 77 | if (index != string::npos) |
| 77 | m_locale.erase(index); //erase all characters starting at index | 78 | m_locale.erase(index); //erase all characters starting at index |
| 78 | 79 | // remove everything after . | |
| 79 | index = m_locale.find('.'); | 80 | index = m_locale.find('.'); |
| 80 | if (index != string::npos) | 81 | if (index != string::npos) |
| 81 | m_locale.erase(index); //erase all characters starting at index | 82 | m_locale.erase(index); //erase all characters starting at index |
diff --git a/src/i18n.hh b/src/I18n.hh index 32503e0..4397cd8 100644 --- a/src/i18n.hh +++ b/src/I18n.hh | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
| 24 | 24 | ||
| 25 | // $Id: i18n.hh,v 1.11 2003/04/26 15:46:03 fluxgen Exp $ | 25 | // $Id: I18n.hh,v 1.1 2003/06/12 14:24:25 fluxgen Exp $ |
| 26 | 26 | ||
| 27 | #ifndef I18N_HH | 27 | #ifndef I18N_HH |
| 28 | #define I18N_HH | 28 | #define I18N_HH |