25.09.24_translation fonctionnel

Author: pythonhtmlcssjsarduino

flask_app/__init__.py

@@ -25,9 +25,6 @@
 app.config['SECRET_KEY'] = 'secret_key' #! change that for deployment
 app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///site.db"
 app.config['BABEL_TRANSLATION_DIRECTORIES'] = f'{app.root_path}/translations'
-app.config['SESSION_COOKIE_PATH'] = '/'
-app.config['SESSION_COOKIE_DOMAIN'] = 'localhost'
-ic(app.config)
 app.jinja_env.add_extension('jinja2.ext.loopcontrols')
 app.url_map.default_subdomain = ''
 
@@ -98,11 +95,11 @@ def decorated_view(*args, **kwargs):
     return decorated_view
 
 def lang_url_for(*args, **kwargs):
-    lang = kwargs.pop('lang', _('app.lang'))
-    if 'static' in args:
+    if 'static' in args or kwargs.get('lang'):
+        return url_for(*args, **kwargs)
+    lang = _('app.lang')
+    if lang == request.accept_languages.best_match(LANGAGES):
         return url_for(*args, **kwargs)
-    if lang == 'fr':
-        return url_for(*args, lang='', **kwargs)
     return url_for(*args, lang=lang, **kwargs)
 
 @app.context_processor
@@ -112,7 +109,7 @@ def inject_lang_url_for():
 def set_route(blueprint, path, **options):
     def decorator(func):
         @blueprint.route(path, **options)
-        @blueprint.route(path, subdomain=options.pop('subdomain', '<lang>'), **options)
+        @blueprint.route(f'/<lang>{path}', **options)
         @wraps(func)
         def wrap(*args, **kwargs):
             lang = kwargs.pop('lang', 'fr')

flask_app/routes.py

@@ -23,10 +23,15 @@ def home():
 
 @app.route('/lang/<lang>/<path:next>')
 def change_lang(lang, next:str):
-    ic(lang, next)
-    next=next.removeprefix('http://')
-    ic(lang, next)
-    ic('.'.join(next.split('.')[1:]), next.find(app.config['SERVER_NAME']))
-    next = '.'.join(next.split('.')[1:]) if next.find(app.config['SERVER_NAME'])!=0 else next
-    ic(lang, next)
-    return redirect('http://'+lang+'.'+next)
+    lang_index = next.find(app.config['SERVER_NAME']) + len(app.config['SERVER_NAME'])
+    first = next[lang_index+1:].split('/')[0]
+    if first in LANGAGES:
+        if lang == request.accept_languages.best_match(LANGAGES):
+            return redirect(f'{next[:lang_index]}{next[lang_index+len(lang)+1:]}')
+        else:
+            return redirect(f'{next[:lang_index]}/{lang}{next[lang_index+len(lang)+1::]}')
+    else:
+        if lang == request.accept_languages.best_match(LANGAGES):
+            return redirect(next)
+        else:
+            return redirect(f'{next[:lang_index]}/{lang}{next[lang_index:]}')

flask_app/view/__init__.py

@@ -6,7 +6,7 @@
 from datetime import datetime
 from flask_babel import _
 
-view = Blueprint('view', __name__, template_folder='templates', url_prefix='/view')
+view = Blueprint('view', __name__, template_folder='templates')
 
 def deg_to_dms(deg):
     """Convert from decimal degrees to degrees, minutes, seconds."""
@@ -17,7 +17,7 @@ def deg_to_dms(deg):
     d, m = int(d), int(m)
     return d, m, s
 
-@set_route(view, '/inscription/<inscription>/delete')
+@set_route(view, '/view/inscription/<inscription>/delete')
 @login_required
 def delete_inscription(inscription):
     user = current_user
@@ -28,7 +28,7 @@ def delete_inscription(inscription):
     return redirect(url_for('home'))
 
 
-@set_route(view, '/inscription/<inscription>')
+@set_route(view, '/view/inscription/<inscription>')
 @login_required
 def view_inscription_page(inscription):
     user = current_user
@@ -56,13 +56,13 @@ def view_inscription_page(inscription):
 
     return render_template('view_inscription.html', user_data=user, inscription=inscription, folium_map=folium_map, rdv_url=rdv_url)
 
-@set_route(view, '/<event>')
+@set_route(view, '/view/<event>')
 def view_event_page(event):
     user_data = current_user if current_user.is_authenticated else None
     event = Event.query.filter_by(name=event).first_or_404(_('view.error.eventdontexist:event').format(event=event))
     return render_template('view_event.html', user_data = user_data, event_data=event, time = datetime.now())
 
-@set_route(view, '/<event>/edition/<edition>')
+@set_route(view, '/view/<event>/edition/<edition>')
 def view_edition_page(event, edition):
     user = current_user if current_user.is_authenticated else None
     event = Event.query.filter_by(name=event).first_or_404(_('view.error.eventdontexist:event').format(event=event))
@@ -71,7 +71,7 @@ def view_edition_page(event, edition):
     rdv_url= "https://www.google.com/maps/place/{0}%C2%B0{1}'{2}".format(*deg_to_dms(edition.rdv_lat))+"%22N+{0}%C2%B0{1}'{2}".format(*deg_to_dms(edition.rdv_lng))+f"%22E/@{edition.rdv_lat},{edition.rdv_lng},15z"
     return render_template('view_edition.html', user_data = user, event_data = event, edition_data=edition, rdv_url=rdv_url, time= datetime.now())
 
-@set_route(view, '/<event>/parcours/<parcours>')
+@set_route(view, '/view/<event>/parcours/<parcours>')
 def view_parcours_page(event, parcours):
     user_data = current_user if current_user.is_authenticated else None
     event = Event.query.filter_by(name=event).first_or_404(_('view.error.eventdontexist:event').format(event=event))