Commit 31eb140b authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Optimized JavaScript in django/views/i18n.py 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent cd7b54aa

django/views/i18n.py

+22 −50
Original line number Diff line number Diff line
@@ -28,21 +28,9 @@ def set_language(request): 
NullSource = """

/* gettext identity library */



function gettext(msgid) {

    return msgid;

}



function ngettext(singular, plural, count) {

    if (count == 1) {

        return singular;

    } else {

        return plural;

    }

}



function gettext_noop(msgid) {

    return msgid;

}

function gettext(msgid) { return msgid; }

function ngettext(singular, plural, count) { return (count == 1) ? singular : plural; }

function gettext_noop(msgid) { return msgid; }

"""



LibHead = """
@@ -58,40 +46,24 @@ function gettext(msgid) { 
  if (typeof(value) == 'undefined') {

    return msgid;

  } else {

        if (typeof(value) == 'string') {

            return value;

        } else {

            return value[0];

        }

    return (typeof(value) == 'string') ? value : value[0];

  }

}



function ngettext(singular, plural, count) {

  value = catalog[singular];

  if (typeof(value) == 'undefined') {

        if (count == 1) {

            return singular;

        } else {

            return plural;

        }

    return (count == 1) ? singular : plural;

  } else {

    return value[pluralidx(count)];

  }

}



function gettext_noop(msgid) {

    return msgid;

}

function gettext_noop(msgid) { return msgid; }

"""



SimplePlural = """

function pluralidx(count) {

    if (count == 1) {

        return 0;

    } else {

        return 1;

    }

}

function pluralidx(count) { return (count == 1) ? 0 : 1; }

"""



InterPolate = r"""