Skip to content

Commit

Permalink
Fix a message & refresh a 'djangojs.po'.
Browse files Browse the repository at this point in the history
  • Loading branch information
genglert committed Feb 7, 2024
1 parent 52d0e63 commit 924d3bc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
2 changes: 0 additions & 2 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
== Version 2.5.5 Work in progress (not released -- this is a draft) ==

TODO: compile .po (core-js)

UPGRADE NOTE :
- You should re-generate the media files (creme generatemedia --settings=[...]).

Expand Down
Binary file modified creme/creme_core/locale/fr/LC_MESSAGES/djangojs.mo
Binary file not shown.
12 changes: 4 additions & 8 deletions creme/creme_core/locale/fr/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Creme Creme-Core 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-22 17:44+0100\n"
"POT-Creation-Date: 2024-02-07 13:02+0100\n"
"Last-Translator: Hybird <[email protected]>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -145,14 +145,7 @@ msgstr "Recherche avancée"
msgid "Best result"
msgstr "Meilleur résultat"

<<<<<<< HEAD
msgid "Loading..."
msgstr "Chargement..."

msgid "Error !"
=======
msgid "Error!"
>>>>>>> 2ccea6b2b... Typo ('en').
msgstr "Erreur !"

msgid "The page will be reloaded!"
Expand Down Expand Up @@ -268,6 +261,9 @@ msgstr[1] "Saisissez au moins %d caractères"
msgid "Loading more results…"
msgstr "Chargement de résultats supplémentaires…"

msgid "⚠"
msgstr "⚠"

msgid "Show more results"
msgstr "Afficher plus de résultats"

Expand Down
4 changes: 2 additions & 2 deletions creme/creme_core/static/creme_core/js/utils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*******************************************************************************
Creme is a free/open-source Customer Relationship Management software
Copyright (C) 2009-2022 Hybird
Copyright (C) 2009-2024 Hybird
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Expand Down Expand Up @@ -71,7 +71,7 @@ creme.utils.loading = function(div_id, is_loaded, params) {
overlay.bind($('body'))
.addClass('page-loading')
.content($('<h2>').append($('<img>').attr('src', creme_media_url("images/wait.gif")),
$('<span>').text(gettext('Loading...'))));
$('<span>').text(gettext('Loading'))));

overlay._loadstack = 0;
}
Expand Down

0 comments on commit 924d3bc

Please sign in to comment.