diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-05-08 17:21:29 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-05-08 17:21:29 -0300 |
| commit | 24d5f1a8d6953ab3ee62566e29850214234f424d (patch) | |
| tree | 4addf7e1a7901e4a4314e66aea46f0c8b43f4af3 | |
| parent | c7985a3d35a0f1099aa4c12c84a71c038bb2d1d0 (diff) | |
| parent | 8dcb2a094cf196e5f2f963168538b1f695c1eca8 (diff) | |
| download | askbot-24d5f1a8d6953ab3ee62566e29850214234f424d.tar.gz askbot-24d5f1a8d6953ab3ee62566e29850214234f424d.tar.bz2 askbot-24d5f1a8d6953ab3ee62566e29850214234f424d.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
| -rw-r--r-- | askbot/templates/meta/fonts.html | 4 | ||||
| -rw-r--r-- | askbot/utils/pluralization.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/askbot/templates/meta/fonts.html b/askbot/templates/meta/fonts.html index 1e0fe707..4332e1a6 100644 --- a/askbot/templates/meta/fonts.html +++ b/askbot/templates/meta/fonts.html @@ -10,6 +10,6 @@ </style> {% else %} {# note: for IE8 we ask for fonts separately #} - <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin-ext' rel='stylesheet' type='text/css'> - <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=cyrillic-ext' rel='stylesheet' type='text/css'> + <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin-ext' rel='stylesheet' type='text/css' /> + <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=cyrillic-ext' rel='stylesheet' type='text/css' /> {% endif %} diff --git a/askbot/utils/pluralization.py b/askbot/utils/pluralization.py index 74549f10..8d78fa77 100644 --- a/askbot/utils/pluralization.py +++ b/askbot/utils/pluralization.py @@ -89,7 +89,7 @@ FORMULAE = { } GERMANNIC_FAMILY = ( - 'en', 'bg', 'bg_BG', 'el', 'nb_NO', 'pt', 'ast', 'ca', 'de', + 'en', 'bg', 'bg_BG', 'el', 'nb_NO', 'pt', 'ast', 'ca', 'de', 'it', 'hu', 'hi', 'sv_SE', 'fi', 'he_IL', 'gl', 'es', 'bn_IN' ) @@ -105,7 +105,7 @@ SLOVENIAN_FAMILY = ('sl',) CHECH_FAMILY = ('cs', 'cs_CZ') SINGULAR_FAMILY = ( - 'zh_HK', 'fa_IR', 'zh_CN', 'id_ID', 'zh_TW', 'ko', 'ms_MY', 'tr', 'tr_TR', 'vi', 'ja' + 'zh_HK', 'fa_IR', 'zh_CN', 'id_ID', 'zh_TW', 'ko', 'ms_MY', 'tr', 'tr_TR', 'vi', 'ja', 'uz', 'uz_UZ' ) def get_formula(lang): |