misc: make N_ a real imported function (#40359)

wcs/admin/forms.py

@@ -28,7 +28,7 @@ from quixote import get_response, redirect
 from quixote.directory import Directory, AccessControlled
 from quixote.html import TemplateIO, htmltext
 
-from wcs.qommon import _, force_str
+from wcs.qommon import _, N_, force_str
 from wcs.qommon import misc
 from wcs.qommon.errors import *
 from wcs.qommon.form import *

wcs/admin/logged_errors.py

@@ -19,7 +19,7 @@ import re
 from quixote import get_response, get_publisher, redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
-from wcs.qommon import _, ngettext
+from wcs.qommon import _, ngettext, N_
 from wcs.qommon import errors, get_cfg
 from wcs.qommon.misc import localstrftime
 

wcs/admin/settings.py

@@ -34,7 +34,7 @@ from quixote import get_publisher, get_request, get_response, redirect
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
-from wcs.qommon import _
+from wcs.qommon import _, N_
 from wcs.qommon import get_cfg
 from wcs.qommon import errors
 from wcs.qommon import misc

wcs/admin/users.py

@@ -20,7 +20,7 @@ from quixote import get_publisher, get_response, get_request, get_session, redir
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext
 
-from wcs.qommon import _, force_str
+from wcs.qommon import _, N_, force_str
 import wcs.qommon.storage as st
 from wcs.qommon import errors
 from wcs.qommon import misc, get_cfg

wcs/backoffice/cards.py

@@ -21,7 +21,7 @@ import time
 from quixote import get_publisher, get_request, get_response, get_session, redirect
 from quixote.html import TemplateIO, htmltext
 
-from ..qommon import _, misc
+from ..qommon import _, N_, misc
 from ..qommon.misc import C_
 
 from wcs.carddef import CardDef

wcs/backoffice/data_management.py

@@ -24,7 +24,7 @@ from django.utils.encoding import force_text
 from django.utils.six import StringIO
 
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon import errors
 from ..qommon import template
 from ..qommon.form import Form, FileWidget

wcs/backoffice/management.py

@@ -36,7 +36,7 @@ from quixote import get_session, get_publisher, get_request, get_response, redir
 from quixote.directory import Directory
 from quixote.html import TemplateIO, htmltext, htmlescape
 
-from ..qommon import _, ngettext, ezt, force_str
+from ..qommon import _, ngettext, N_, ezt, force_str
 from ..qommon.admin.emails import EmailsDirectory
 from ..qommon.admin.menu import command_icon
 from ..qommon.backoffice.menu import html_top

wcs/backoffice/root.py

@@ -19,7 +19,7 @@ from django.utils.translation import pgettext
 from quixote import get_publisher, get_request, get_response, redirect
 from quixote.html import TemplateIO, htmltext
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.backoffice import BackofficeRootDirectory
 from ..qommon.backoffice.menu import html_top
 

wcs/categories.py

@@ -17,6 +17,7 @@
 from quixote import get_publisher, get_response
 from quixote.html import htmltext
 
+from .qommon import N_
 from .qommon.storage import StorableObject
 from .qommon.misc import simplify
 from .qommon.substitution import Substitutions

wcs/fields.py

@@ -35,7 +35,7 @@ from django.utils.formats import date_format as django_date_format
 from django.utils.html import urlize
 from django.utils.six.moves.html_parser import HTMLParser
 
-from .qommon import _, force_str
+from .qommon import _, N_, force_str
 from .qommon import evalutils
 from .qommon.form import *
 from .qommon.misc import localstrftime, strftime, date_format, ellipsize, xml_node_text

wcs/formdata.py

@@ -27,7 +27,7 @@ from django.utils import six
 from quixote import get_request, get_publisher, get_session
 from quixote.http_request import Upload
 
-from .qommon import _
+from .qommon import _, N_
 from .qommon.storage import StorableObject, Intersects, Contains
 from .qommon import misc
 from .qommon.evalutils import make_datetime

wcs/formdef.py

@@ -31,7 +31,7 @@ from django.utils.encoding import force_bytes, force_text
 from quixote import get_request, get_publisher
 from quixote.http_request import Upload
 
-from .qommon import _, force_str, PICKLE_KWARGS
+from .qommon import _, N_, force_str, PICKLE_KWARGS
 from .qommon.storage import StorableObject, fix_key
 from .qommon.cron import CronJob
 from .qommon.form import *

wcs/forms/actions.py

@@ -17,6 +17,7 @@
 from quixote import redirect
 from quixote.directory import Directory
 
+from ..qommon import N_
 from ..qommon import errors
 from ..qommon import misc
 from ..qommon import template

wcs/forms/root.py

@@ -37,7 +37,7 @@ from quixote.util import randbytes
 from quixote.form.widget import *
 from quixote.html import TemplateIO, htmltext
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.admin.emails import EmailsDirectory
 from ..qommon import errors, get_cfg
 from ..qommon import misc, get_logger

wcs/portfolio.py

@@ -22,7 +22,7 @@ from django.utils.encoding import force_text
 from django.utils.six.moves.urllib import parse as urllib
 from django.utils.six.moves.urllib import parse as urlparse
 
-from .qommon import get_logger
+from .qommon import N_, get_logger
 from .qommon.misc import http_get_page, json_loads, http_post_request, urlopen
 from quixote import get_publisher, get_request, get_response, redirect, get_session
 from quixote.directory import Directory

wcs/qommon/__init__.py

@@ -53,6 +53,10 @@ def ngettext(*args):
     return force_str(force_text(pub.ngettext(*args)))
 
 
+def N_(x):
+    return x
+
+
 from .publisher import get_cfg, get_logger, get_publisher_class
 from . import publisher
 publisher._ = _

wcs/qommon/admin/menu.py

@@ -17,7 +17,7 @@
 from quixote import get_publisher, get_request
 from quixote.html import TemplateIO, htmltext
 
-from .. import _
+from .. import _, N_
 from ..backoffice.menu import html_top
 import re
 

wcs/qommon/admin/settings.py

@@ -18,7 +18,7 @@ from quixote import redirect
 from quixote.directory import Directory, AccessControlled
 from quixote.html import TemplateIO, htmltext
 
-from .. import _
+from .. import _, N_
 from ..form import *
 from ..admin.cfg import cfg_submit
 from ..backoffice.menu import html_top

wcs/qommon/errors.py

@@ -21,7 +21,7 @@ import quixote
 from quixote.errors import *
 from quixote.html import TemplateIO, htmltext
 
-from . import template
+from . import N_, template
 
 
 class AccessForbiddenError(AccessError):

wcs/qommon/form.py

@@ -74,7 +74,7 @@ from .template import render as render_template, Template, TemplateError
 from ..portfolio import has_portfolio
 from wcs.conditions import Condition, ValidationError
 
-from . import _, ngettext, force_str
+from . import _, ngettext, N_, force_str
 from . import misc
 from .humantime import humanduration2seconds, seconds2humanduration, timewords
 from .misc import strftime, C_, HAS_PDFTOPPM, json_loads

wcs/qommon/http_response.py

@@ -25,6 +25,7 @@ from quixote.util import randbytes
 import quixote.http_response
 from quixote import get_publisher, get_request
 
+from . import N_
 from .storage import StorableObject
 
 

wcs/qommon/humantime.py

@@ -16,7 +16,7 @@
 
 import re
 
-from . import _
+from . import _, N_
 
 _minute = 60
 _hour = 60 * 60

wcs/qommon/ident/franceconnect.py

@@ -26,7 +26,7 @@ from quixote import redirect, get_session, get_publisher, get_request, get_sessi
 from quixote.directory import Directory
 from quixote.html import htmltext, TemplateIO
 
-from .. import _
+from .. import _, N_
 from ..backoffice.menu import html_top
 from .. import template, get_cfg, get_logger
 from ..form import (Form, StringWidget, CompositeWidget, ComputedExpressionWidget,

wcs/qommon/ident/idp.py

@@ -27,7 +27,7 @@ from quixote.directory import Directory
 from quixote import redirect, get_session, get_response, get_publisher
 from quixote.html import htmltext, TemplateIO
 
-from .. import _
+from .. import _, N_
 from .. import misc, get_cfg, get_logger
 from ..form import *
 from ..tokens import Token

wcs/qommon/ident/password.py

@@ -24,7 +24,7 @@ from quixote import redirect, get_publisher
 from quixote.directory import AccessControlled, Directory
 from quixote.html import TemplateIO, htmltext
 
-from .. import _, ngettext
+from .. import _, ngettext, N_
 from ..form import *
 
 from ..publisher import get_publisher_class

wcs/qommon/myspace.py

@@ -18,7 +18,7 @@ from quixote import get_publisher, get_request, redirect, get_response, get_sess
 from quixote.directory import Directory
 from quixote.html import htmltext, TemplateIO
 
-from . import _
+from . import _, N_
 from . import template
 from .form import *
 from . import get_cfg

wcs/qommon/publisher.py

@@ -57,7 +57,7 @@ from .http_response import HTTPResponse, AfterJob
 from .cron import CronJob
 from .substitution import Substitutions, CompatibilityNamesDict
 
-from . import force_str
+from . import N_, force_str
 from . import errors
 from . import template
 import logging

wcs/qommon/sms.py

@@ -18,7 +18,7 @@ import re
 
 from django.utils.six.moves.urllib import parse as urllib
 
-from . import errors, misc
+from . import N_, errors, misc
 from . import get_cfg, get_logger
 from .form import StringWidget, PasswordWidget
 from wcs.wscalls import call_webservice

wcs/users.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from .qommon import _
+from .qommon import _, N_
 from .qommon.misc import simplify
 from .qommon.storage import StorableObject
 from .qommon import get_cfg

wcs/wf/aggregation_email.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.publisher import get_publisher_class
 from ..qommon.storage import StorableObject
 from ..qommon.form import *

wcs/wf/anonymise.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+from wcs.qommon import N_
 from wcs.workflows import WorkflowStatusItem, register_item_class
 
 

wcs/wf/attachment.py

@@ -18,7 +18,7 @@
 from django.utils.six.moves.urllib import parse as urllib
 from quixote import redirect
 
-from ..qommon import _
+from ..qommon import _, N_
 from wcs.workflows import *
 from ..qommon.errors import *
 

wcs/wf/backoffice_fields.py

@@ -16,7 +16,7 @@
 
 import xml.etree.ElementTree as ET
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.form import (WidgetListAsTable, CompositeWidget, SingleSelectWidget,
         ComputedExpressionWidget, StringWidget)
 from wcs.fields import WidgetField

wcs/wf/create_formdata.py

@@ -22,7 +22,7 @@ from quixote.html import htmltext
 
 from django.utils.functional import cached_property
 
-from wcs.qommon import _
+from wcs.qommon import _, N_
 from wcs.qommon.form import (WidgetListAsTable, CompositeWidget,
                              SingleSelectWidget, ComputedExpressionWidget,
                              CheckboxWidget, VarnameWidget, HtmlWidget)

wcs/wf/criticality.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from ..qommon import _
+from ..qommon import _, N_
 from wcs.qommon.form import SingleSelectWidget
 from wcs.workflows import WorkflowStatusItem, register_item_class
 

wcs/wf/dispatch.py

@@ -17,7 +17,7 @@
 import collections
 import xml.etree.ElementTree as ET
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.form import *
 from ..qommon.template import Template
 from ..qommon import get_logger

wcs/wf/export_to_model.py

@@ -31,7 +31,7 @@ from quixote import get_response, get_request, get_publisher
 from quixote.directory import Directory
 from quixote.html import htmltext
 
-from ..qommon import _, ezt, misc, force_str
+from ..qommon import _, N_, ezt, misc, force_str
 from ..qommon import get_logger
 from ..qommon.form import (SingleSelectWidget, WidgetList, CheckboxWidget,
                          StringWidget, UploadWidget, WysiwygTextWidget, Upload,

wcs/wf/form.py

@@ -16,7 +16,7 @@
 
 import xml.etree.ElementTree as ET
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.form import *
 
 from wcs.workflows import WorkflowStatusItem, register_item_class

wcs/wf/geolocate.py

@@ -26,7 +26,7 @@ except ImportError:
 from django.utils.six.moves.urllib import parse as urlparse
 from quixote import get_publisher
 
-from ..qommon import _, force_str
+from ..qommon import _, N_, force_str
 from ..qommon import get_logger
 from ..qommon.errors import ConnectionError
 from ..qommon.form import RadiobuttonsWidget, ComputedExpressionWidget, CheckboxWidget

wcs/wf/jump.py

@@ -23,7 +23,7 @@ from django.utils import six
 from quixote import get_publisher, get_request, redirect
 
 from quixote.directory import Directory
-from ..qommon import _, force_str
+from ..qommon import _, N_, force_str
 from ..qommon.humantime import *
 from ..qommon.form import *
 from ..qommon import errors

wcs/wf/notification.py

@@ -16,7 +16,7 @@
 
 from quixote import get_publisher
 
-from ..qommon import _, ezt
+from ..qommon import _, N_, ezt
 from ..qommon.form import *
 from ..qommon.template import TemplateError
 from ..qommon import get_logger

wcs/wf/profile.py

@@ -23,7 +23,7 @@ import xml.etree.ElementTree as ET
 from django.utils.six.moves.urllib import parse as urlparse
 from quixote import get_publisher, get_response, get_request
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.form import (CompositeWidget, SingleSelectWidget,
         WidgetListAsTable, ComputedExpressionWidget)
 from ..qommon.ident.idp import is_idp_managing_user_attributes

wcs/wf/redirect_to_url.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.form import ComputedExpressionWidget
 from wcs.workflows import WorkflowStatusItem, register_item_class
 

wcs/wf/register_comment.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from ..qommon import _, ezt
+from ..qommon import _, N_, ezt
 from ..qommon.form import *
 from ..qommon.template import TemplateError
 from ..qommon import get_logger

wcs/wf/remove.py

@@ -15,7 +15,7 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from quixote import get_publisher, get_request, get_response, get_session
-from ..qommon import _
+from ..qommon import _, N_
 from wcs.workflows import WorkflowStatusItem, register_item_class
 
 

wcs/wf/resubmit.py

@@ -16,7 +16,7 @@
 
 from quixote import get_publisher, get_request, get_session
 
-from ..qommon import _
+from ..qommon import _, N_
 from wcs.workflows import WorkflowStatusItem, register_item_class
 from wcs.formdef import FormDef
 from wcs.qommon.form import (WidgetList, SingleSelectWidget, StringWidget,

wcs/wf/roles.py

@@ -21,7 +21,7 @@ from django.utils.six.moves.urllib import parse as urlparse
 
 from quixote import get_request, get_publisher, get_response
 
-from ..qommon import _
+from ..qommon import _, N_
 from ..qommon.form import *
 from wcs.workflows import WorkflowStatusItem, register_item_class
 from wcs.roles import get_user_roles, Role

wcs/wf/timeout_jump.py

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+from wcs.qommon import N_
 from .jump import JumpWorkflowStatusItem, register_item_class
 
 

wcs/wf/wscall.py

@@ -27,7 +27,7 @@ from django.utils.six import BytesIO
 
 from quixote.html import TemplateIO, htmltext
 
-from ..qommon import _, force_str
+from ..qommon import _, N_, force_str
 from ..qommon.errors import ConnectionError
 from ..qommon.form import *
 from ..qommon.misc import json_loads

wcs/workflows.py

@@ -30,7 +30,7 @@ from django.utils.encoding import force_text
 
 from quixote import get_request, get_response, redirect
 
-from .qommon import _, force_str
+from .qommon import _, N_, force_str
 from .qommon.misc import C_, get_as_datetime, file_digest, get_foreground_colour, xml_node_text
 from .qommon.storage import StorableObject, atomic_write, NotEqual, Contains, Null, pickle_2to3_conversion
 from .qommon.form import *