jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1275 from eMerzh/fix_changelog

Browse source 
fix: correct changelog link
This commit is contained in:
Yohan Boniface 2023-08-23 08:51:27 +02:00 committed by GitHub
commit 74cfd18a2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -2,7 +2,7 @@
# uMap project # uMap project
[![Requirements Status](https://requires.io/github/umap-project/umap/requirements.svg?branch=master)](https://requires.io/github/umap-project/umap/requirements/?branch=master) [![Requirements Status](https://requires.io/github/umap-project/umap/requirements.svg?branch=master)](https://requires.io/github/umap-project/umap/requirements/?branch=master)
[![Join the chat at https://gitter.im/umap-project/umap](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/umap-project/umap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Documentation Status](https://readthedocs.org/projects/umap-project/badge/?version=latest)](http://umap-project.readthedocs.io/en/latest/?badge=latest)[![Build Status](https://travis-ci.org/umap-project/umap.svg?branch=master)](https://travis-ci.org/umap-project/umap) [![Join the chat at https://gitter.im/umap-project/umap](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/umap-project/umap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Documentation Status](https://readthedocs.org/projects/umap-project/badge/?version=latest)](http://umap-project.readthedocs.io/en/master/?badge=latest)[![Build Status](https://travis-ci.org/umap-project/umap.svg?branch=master)](https://travis-ci.org/umap-project/umap)
## About ## About
@ -13,4 +13,4 @@ Built on top of Django and Leaflet.
## Installation and configuration ## Installation and configuration
See [developer documentation](https://umap-project.readthedocs.io/en/latest/install/). See [developer documentation](https://umap-project.readthedocs.io/en/master/install/).

5
umap/settings/base.py
View file

@ -2,9 +2,9 @@
# Import global settings to make it easier to extend settings. # Import global settings to make it easier to extend settings.
from email.utils import parseaddr from email.utils import parseaddr
from django.template.defaultfilters import slugify
from django.conf.locale import LANG_INFO
import environ import environ
from django.conf.locale import LANG_INFO
from django.template.defaultfilters import slugify
env = environ.Env() env = environ.Env()
@ -137,6 +137,7 @@ FORM_RENDERER = "django.forms.renderers.DjangoDivFormRenderer"
# ============================================================================= # =============================================================================
import os import os
import umap as project_module import umap as project_module
PROJECT_DIR = os.path.dirname(os.path.realpath(project_module.__file__)) PROJECT_DIR = os.path.dirname(os.path.realpath(project_module.__file__))

2
umap/static/umap/js/umap.controls.js
View file

@ -911,7 +911,7 @@ L.U.Map.include({
leaflet: 'http://leafletjs.com', leaflet: 'http://leafletjs.com',
django: 'https://www.djangoproject.com', django: 'https://www.djangoproject.com',
umap: 'http://wiki.openstreetmap.org/wiki/UMap', umap: 'http://wiki.openstreetmap.org/wiki/UMap',
changelog: 'https://umap-project.readthedocs.io/en/latest/changelog/', changelog: 'https://umap-project.readthedocs.io/en/master/changelog/',
version: this.options.umap_version, version: this.options.umap_version,
} }
umapCredit.innerHTML = L._( umapCredit.innerHTML = L._(

2
umap/templates/umap/content_footer.html
View file

@ -2,7 +2,7 @@
<footer> <footer>
<a href="https://wiki.openstreetmap.org/wiki/UMap" class="branding">uMap</a> <a href="https://wiki.openstreetmap.org/wiki/UMap" class="branding">uMap</a>
an OpenStreetMap project an OpenStreetMap project
(version <a href="https://umap-project.readthedocs.io/en/latest/changelog/">{{ UMAP_VERSION }}</a>) (version <a href="https://umap-project.readthedocs.io/en/master/changelog/">{{ UMAP_VERSION }}</a>)
{% get_language_info_list for LANGUAGES as languages %} {% get_language_info_list for LANGUAGES as languages %}
<form action="{% url "set_language" %}" method="post" class="i18n_switch"> <form action="{% url "set_language" %}" method="post" class="i18n_switch">
{% csrf_token %} {% csrf_token %}