From ec92b8fff19c2573fa04bcbd33801ed7b62f5a0a Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 30 Aug 2012 14:54:40 -0500
Subject: [PATCH] fixed path find for pluralization rules

---
 VERSION                                     | 2 +-
 applications/welcome/languages/default.py   | 1 +
 applications/welcome/languages/plural-en.py | 1 +
 gluon/languages.py                          | 6 ++++--
 gluon/tests/test_languages.py               | 4 ++++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 0c636d4b..267b104b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.2 (2012-08-30 14:49:47) stable
+Version 2.0.2 (2012-08-30 14:54:37) stable
diff --git a/applications/welcome/languages/default.py b/applications/welcome/languages/default.py
index 31757f18..5e6e8125 100644
--- a/applications/welcome/languages/default.py
+++ b/applications/welcome/languages/default.py
@@ -4,6 +4,7 @@
 '!langname!': 'English (US)',
 '%s %%(shop)': '%s %%(shop)',
 '%s %%(shop[0])': '%s %%(shop[0])',
+'%s %%{quark[0]}': '%s %%{quark[0]}',
 '%s %%{shop[0]}': '%s %%{shop[0]}',
 '%s %%{shop}': '%s %%{shop}',
 '%Y-%m-%d': '%Y-%m-%d',
diff --git a/applications/welcome/languages/plural-en.py b/applications/welcome/languages/plural-en.py
index d0ea585e..562d96f1 100644
--- a/applications/welcome/languages/plural-en.py
+++ b/applications/welcome/languages/plural-en.py
@@ -6,6 +6,7 @@
 'is': ['are'],
 'man': ['men'],
 'person': ['people'],
+'quark': ['quarks'],
 'shop': ['shops'],
 'this': ['these'],
 'was': ['were'],
diff --git a/gluon/languages.py b/gluon/languages.py
index c0a13df0..1cf40780 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -18,7 +18,7 @@ import portalocker
 import logging
 import marshal
 import copy_reg
-from fileutils import abspath, listdir
+from fileutils import listdir
 import settings
 from cfs import getcfs
 from thread import allocate_lock
@@ -31,6 +31,8 @@ __all__ = ['translator', 'findT', 'update_all_languages']
 ospath = os.path
 ostat = os.stat
 osep = os.sep
+pjoin = os.path.join
+pdirname = os.path.dirname
 isdir = os.path.isdir
 is_gae = settings.global_settings.web2py_runtime_gae
 
@@ -244,7 +246,7 @@ def read_possible_plurals():
     create list of all possible plural rules files
     result is cached to increase speed
     """
-    pdir = abspath('gluon','contrib','rules')
+    pdir = pjoin(pdirname(__file__),'contrib','rules')
     plurals = {}
     # scan rules directory for plural_rules-*.py files:
     for pname in os.listdir(pdir):
diff --git a/gluon/tests/test_languages.py b/gluon/tests/test_languages.py
index 070fb874..635eeea2 100644
--- a/gluon/tests/test_languages.py
+++ b/gluon/tests/test_languages.py
@@ -81,6 +81,10 @@ try:
                              '1 shop')
             self.assertEqual(str(T('%s %%{shop[0]}', 2)),
                              '2 shops')
+            self.assertEqual(str(T('%s %%{quark[0]}', 1)),
+                             '1 quark')
+            self.assertEqual(str(T('%s %%{quark[0]}', 2)),
+                             '2 quarks')
             self.assertEqual(str(T.M('**Hello World**')),
                              '<strong>Hello World</strong>')
             T.force('it')