Ticket #13838: localflavor_jp.patch

django/contrib/localflavor/jp/forms.py

@@ +1 @@
+#:coding=utf-8:
 """
 JP-specific Form helpers
 """
@@ -35 +36 @@
     def __init__(self, attrs=None):
         from jp_prefectures import JP_PREFECTURES
         super(JPPrefectureSelect, self).__init__(attrs, choices=JP_PREFECTURES)
+
+class JPPrefectureCodeSelect(Select):
+    """
+    A Select widget that uses a list of Japanese prefectures as its choices
+    and the prefecture code as the post value.
+    """
+    def __init__(self, attrs=None):
+        from jp_prefectures import JP_PREFECTURE_CODES
+        super(JPPrefectureCodeSelect, self).__init__(attrs, choices=JP_PREFECTURE_CODES)
+
+# Common character validation fields for Japanese.
+# Must be used with unicode objects.
+
+HIRAGANA_RE = ur'^[ぁ-ゞー〜～＆ 　、・]*$'
+class HiraganaCharField(RegexField):
+    """
+    A field for accepting only Hiragana characters.
+    """
+    default_error_messages = {
+        'invalid': _('Enter Hiragana characters only.'),
+    }
+    def __init__(self, *args, **kwargs):
+        super(HiraganaCharField, self).__init__(HIRAGANA_RE, *args, **kwargs)
+
+KATAKANA_RE = ur'^[ァ-ヴー〜～＆ 　、・]*$'
+class KatakanaCharField(RegexField):
+    """
+    A field for accepting only full width Katakana characters.
+    """
+    default_error_messages = {
+        'invalid': _('Enter Katakana characters only.'),
+    }
+    def __init__(self, *args, **kwargs):
+        super(KatakanaCharField, self).__init__(KATAKANA_RE, *args, **kwargs)
+
+FULL_WIDTH_RE = ur'^[一-龠]*|[ぁ-ゞ]*|[ァ-ヴ]*|[０-９]*$'
+class FullWidthCharField(RegexField):
+    """
+    A field for accepting only full width Japanese characters.
+    """
+    default_error_messages = {
+        'invalid': _('Enter full width characters only.'),
+    }
+    def __init__(self, *args, **kwargs):
+        super(FullWidthCharField, self).__init__(FULL_WIDTH_RE, *args, **kwargs)
+
+HALF_WIDTH_KATAKANA_RE = ur'^[ｧ-ﾟ-~& ,]*$'
+class HalfWidthKatakanaCharField(RegexField):
+    """
+    A field for accepting only half width Katakana characters.
+    """
+    default_error_messages = {
+        'invalid': _('Enter half width Katakana characters only.'),
+    }
+    def __init__(self, *args, **kwargs):
+        super(HalfWidthKatakanaCharField, self).__init__(FULL_WIDTH_RE, *args, **kwargs)

django/contrib/localflavor/jp/jp_prefectures.py

@@ -1 +1 @@
 from django.utils.translation import ugettext_lazy
 
+"""
+Prefectures ordered to conform with the Japanese entry
+of ISO-3166 as this ordering is widely used in Japan.
+
+See:
+http://en.wikipedia.org/wiki/ISO_3166-2:JP
+"""
+
 JP_PREFECTURES = (
     ('hokkaido', ugettext_lazy('Hokkaido'),),
     ('aomori', ugettext_lazy('Aomori'),),
@@ -15 +23 @@
     ('chiba', ugettext_lazy('Chiba'),),
     ('tokyo', ugettext_lazy('Tokyo'),),
     ('kanagawa', ugettext_lazy('Kanagawa'),),
-    ('yamanashi', ugettext_lazy('Yamanashi'),),
-    ('nagano', ugettext_lazy('Nagano'),),
     ('niigata', ugettext_lazy('Niigata'),),
     ('toyama', ugettext_lazy('Toyama'),),
     ('ishikawa', ugettext_lazy('Ishikawa'),),
     ('fukui', ugettext_lazy('Fukui'),),
+    ('yamanashi', ugettext_lazy('Yamanashi'),),
+    ('nagano', ugettext_lazy('Nagano'),),
     ('gifu', ugettext_lazy('Gifu'),),
     ('shizuoka', ugettext_lazy('Shizuoka'),),
     ('aichi', ugettext_lazy('Aichi'),),
@@ -49 +57 @@
     ('kagoshima', ugettext_lazy('Kagoshima'),),
     ('okinawa', ugettext_lazy('Okinawa'),),
 )
+
+JP_PREFECTURE_CODES = (
+    (1, ugettext_lazy('Hokkaido'),),
+    (2, ugettext_lazy('Aomori'),),
+    (3, ugettext_lazy('Iwate'),),
+    (4, ugettext_lazy('Miyagi'),),
+    (5, ugettext_lazy('Akita'),),
+    (6, ugettext_lazy('Yamagata'),),
+    (7, ugettext_lazy('Fukushima'),),
+    (8, ugettext_lazy('Ibaraki'),),
+    (9, ugettext_lazy('Tochigi'),),
+    (10, ugettext_lazy('Gunma'),),
+    (11, ugettext_lazy('Saitama'),),
+    (12, ugettext_lazy('Chiba'),),
+    (13, ugettext_lazy('Tokyo'),),
+    (14, ugettext_lazy('Kanagawa'),),
+    (15, ugettext_lazy('Niigata'),),
+    (16, ugettext_lazy('Toyama'),),
+    (17, ugettext_lazy('Ishikawa'),),
+    (18, ugettext_lazy('Fukui'),),
+    (19, ugettext_lazy('Yamanashi'),),
+    (20, ugettext_lazy('Nagano'),),
+    (21, ugettext_lazy('Gifu'),),
+    (22, ugettext_lazy('Shizuoka'),),
+    (23, ugettext_lazy('Aichi'),),
+    (24, ugettext_lazy('Mie'),),
+    (25, ugettext_lazy('Shiga'),),
+    (26, ugettext_lazy('Kyoto'),),
+    (27, ugettext_lazy('Osaka'),),
+    (28, ugettext_lazy('Hyogo'),),
+    (29, ugettext_lazy('Nara'),),
+    (30, ugettext_lazy('Wakayama'),),
+    (31, ugettext_lazy('Tottori'),),
+    (32, ugettext_lazy('Shimane'),),
+    (33, ugettext_lazy('Okayama'),),
+    (34, ugettext_lazy('Hiroshima'),),
+    (35, ugettext_lazy('Yamaguchi'),),
+    (36, ugettext_lazy('Tokushima'),),
+    (37, ugettext_lazy('Kagawa'),),
+    (38, ugettext_lazy('Ehime'),),
+    (39, ugettext_lazy('Kochi'),),
+    (40, ugettext_lazy('Fukuoka'),),
+    (41, ugettext_lazy('Saga'),),
+    (42, ugettext_lazy('Nagasaki'),),
+    (43, ugettext_lazy('Kumamoto'),),
+    (44, ugettext_lazy('Oita'),),
+    (45, ugettext_lazy('Miyazaki'),),
+    (46, ugettext_lazy('Kagoshima'),),
+    (47, ugettext_lazy('Okinawa'),),
+)

tests/regressiontests/forms/localflavor/jp.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 # Tests for the contrib/localflavor/ JP form fields.
+from django.test import TestCase
 
 tests = r"""
 # JPPostalCodeField ###############################################################
@@ -69 +70 @@
 <option value="chiba">Chiba</option>
 <option value="tokyo">Tokyo</option>
 <option value="kanagawa" selected="selected">Kanagawa</option>
-<option value="yamanashi">Yamanashi</option>
-<option value="nagano">Nagano</option>
 <option value="niigata">Niigata</option>
 <option value="toyama">Toyama</option>
 <option value="ishikawa">Ishikawa</option>
 <option value="fukui">Fukui</option>
+<option value="yamanashi">Yamanashi</option>
+<option value="nagano">Nagano</option>
 <option value="gifu">Gifu</option>
 <option value="shizuoka">Shizuoka</option>
 <option value="aichi">Aichi</option>
@@ -103 +104 @@
 <option value="kagoshima">Kagoshima</option>
 <option value="okinawa">Okinawa</option>
 </select>
+
+>>> from django.contrib.localflavor.jp.forms import JPPrefectureCodeSelect
+>>> w = JPPrefectureCodeSelect()
+>>> print w.render('prefecture', 'kanagawa')
+<select name="prefecture">
+<option value="1">Hokkaido</option>
+<option value="2">Aomori</option>
+<option value="3">Iwate</option>
+<option value="4">Miyagi</option>
+<option value="5">Akita</option>
+<option value="6">Yamagata</option>
+<option value="7">Fukushima</option>
+<option value="8">Ibaraki</option>
+<option value="9">Tochigi</option>
+<option value="10">Gunma</option>
+<option value="11">Saitama</option>
+<option value="12">Chiba</option>
+<option value="13">Tokyo</option>
+<option value="14">Kanagawa</option>
+<option value="15">Niigata</option>
+<option value="16">Toyama</option>
+<option value="17">Ishikawa</option>
+<option value="18">Fukui</option>
+<option value="19">Yamanashi</option>
+<option value="20">Nagano</option>
+<option value="21">Gifu</option>
+<option value="22">Shizuoka</option>
+<option value="23">Aichi</option>
+<option value="24">Mie</option>
+<option value="25">Shiga</option>
+<option value="26">Kyoto</option>
+<option value="27">Osaka</option>
+<option value="28">Hyogo</option>
+<option value="29">Nara</option>
+<option value="30">Wakayama</option>
+<option value="31">Tottori</option>
+<option value="32">Shimane</option>
+<option value="33">Okayama</option>
+<option value="34">Hiroshima</option>
+<option value="35">Yamaguchi</option>
+<option value="36">Tokushima</option>
+<option value="37">Kagawa</option>
+<option value="38">Ehime</option>
+<option value="39">Kochi</option>
+<option value="40">Fukuoka</option>
+<option value="41">Saga</option>
+<option value="42">Nagasaki</option>
+<option value="43">Kumamoto</option>
+<option value="44">Oita</option>
+<option value="45">Miyazaki</option>
+<option value="46">Kagoshima</option>
+<option value="47">Okinawa</option>
+</select>
 """
+
+class JPLocalFlavorFormFieldTests(object):
+    def test_validation(self):
+        for text in self.texts:
+            form = self.formcls({"text": text})
+            self.assertTrue(form.is_valid())
+
+        for text in self.bad_texts:
+            form = self.formcls({"text": text})
+            self.assertFalse(form.is_valid())
+
+class JPHiraganaTest(JPLocalFlavorFormFieldTests, TestCase):
+    def setUp(self):
+        self.formcls = HiraganaForm
+        self.texts = [u"ひらがな", u"～ひら＆かなー", u"ほげほげ"]
+        self.bad_texts = [u"スパム", u"エッグス", u"漢字", u"ながすぎるてきすと"]
+
+class JPKatakanaTest(JPLocalFlavorFormFieldTests, TestCase):
+    def setUp(self):
+        self.formcls = KatakanaForm
+        self.texts = [u"カタカナ", u"～カタ＆カナー", u"ホゲホゲ"]
+        self.bad_texts = [u"すぱむ", u"えっぐず", u"漢字", u"ナガスギルテキスト"]
+
+class JPFullWidthTest(JPLocalFlavorFormFieldTests, TestCase):
+    def setUp(self):
+        self.formcls = FullWidthForm
+        self.texts = [u"カタカナ", u"～ひら＆カナー", u"ホゲはげ", u"番号０２８４"]
+        self.bad_texts = [u"ﾊﾝｶｸ", u"en 英語", u"ぜんmo", u"1234", u"長すぎる文字テスト"]
+        
+class JPHalfWidthKatakanaTest(JPLocalFlavorFormFieldTests, TestCase):
+    def setUp(self):
+        self.formcls = FullWidthForm
+        self.texts = [u"ﾊﾝｶｸ", u"ｲｲﾅ~", u"ﾊﾝ&ｶｸ", u"-ﾃｽﾄ"]
+        self.bad_texts = [u"ﾊﾝｶｸ2", u"moji", u"文字", u"1234", "ﾅｶﾞｽｷﾞﾙﾃｽﾄ"]