Projet

Général

Profil

0001-arcgis-delay-help_text-gettext-call-45715.patch

Frédéric Péters, 04 août 2020 08:32

Télécharger (2,25 ko)

Voir les différences: 

Subject: [PATCH] arcgis: delay help_text gettext call (#45715)


 passerelle/apps/arcgis/models.py | 4 ++--
 passerelle/utils/__init__.py     | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
passerelle/apps/arcgis/models.py
25 25 
from django.utils import six
26 26 
from django.utils.text import slugify
27 27 
from django.utils.translation import ugettext_lazy as _
28 
from django.utils.html import mark_safe, format_html
29 28 

  		




  
  29
  
    
from passerelle.utils import mark_safe_lazy

  		




  30
  30
  
    
from passerelle.utils.jsonresponse import APIError

  		




  31
  31
  
    
from passerelle.utils.api import endpoint

  		




  32
  32
  
    
from passerelle.utils.conversion import num2deg

  		




  ......




  302
  302
  
    
        verbose_name=_('ArcGis Where Clause'),

  		




  303
  303
  
    
        blank=True,

  		




  304
  304
  
    
        validators=[validate_where],

  		




  305
  
  
    
        help_text=mark_safe(

  		




  
  305
  
    
        help_text=mark_safe_lazy(

  		




  306
  306
  
    
            _(

  		




  307
  307
  
    
                '<span>Use syntax <tt>{name}</tt> to introduce a string '

  		




  308
  308
  
    
                'parameter and <tt>{name:d}</tt> for a decimal parameter. ex.:<br/>'

  		












  

    
      passerelle/utils/__init__.py
    
  





  34
  34
  
    
from django.template import Template, Context

  		




  35
  35
  
    
from django.utils.decorators import available_attrs

  		




  36
  36
  
    
from django.utils.encoding import force_bytes, force_text

  		




  
  37
  
    
from django.utils.functional import lazy

  		




  
  38
  
    
from django.utils.html import mark_safe

  		




  37
  39
  
    
from django.utils.six import BytesIO

  		




  38
  40
  
    
from django.views.generic.detail import SingleObjectMixin

  		




  39
  41
  
    
from django.contrib.contenttypes.models import ContentType

  		




  ......




  42
  44
  
    
from passerelle.base.signature import check_query, check_url

  		




  43
  45
  
    

  		




  44
  46
  
    

  		




  
  47
  
    
mark_safe_lazy = lazy(mark_safe, str)

  		




  
  48
  
    

  		




  
  49
  
    

  		




  45
  50
  
    
def response_for_json(request, data):

  		




  46
  51
  
    
    import json

  		




  47
  52
  
    

  		




  48
  
  
    
-