Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Locale Cleanup #6929

Merged
merged 16 commits into from
Apr 6, 2024
Merged

Locale Cleanup #6929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6b95bf3
added ja files from POeditor
DawoudIO Apr 6, 2024
53f82f4
added Ja to active languages
DawoudIO Apr 6, 2024
c14e831
fixed == to ===
DawoudIO Apr 6, 2024
78eb697
better debug
DawoudIO Apr 6, 2024
6a32f36
removed extra ; from locale combined file.
DawoudIO Apr 6, 2024
eb6111c
stop the loop of updating setting over and over and over...
DawoudIO Apr 6, 2024
201330a
Facebook / X and LinkedIn do not need to be a localized as they Brands
DawoudIO Apr 6, 2024
8f6613c
js order cleanup
DawoudIO Apr 6, 2024
5039d63
fixed the system locale display
DawoudIO Apr 6, 2024
e0a8fc8
moving to cleaner JS
DawoudIO Apr 6, 2024
9ce7d12
Hide % complete for english locales
DawoudIO Apr 6, 2024
68316f1
fixed china and jp flags
DawoudIO Apr 6, 2024
6a33d1b
re-added hide % if > 90%
DawoudIO Apr 6, 2024
021763c
Merge branch 'master' into locale/new-locales-4-2024
DawoudIO Apr 6, 2024
7100ccd
Merge branch 'master' into locale/new-locales-4-2024
DawoudIO Apr 6, 2024
7039ac5
Merge branch 'master' into locale/new-locales-4-2024
DawoudIO Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,42 +501,41 @@ module.exports = function (grunt) {
grunt.registerTask('genLocaleJSFiles', '', function () {
var locales = grunt.file.readJSON("src/locale/locales.json");
for (var key in locales ) {
var localeConfig = locales[key];
var locale = localeConfig["locale"];
var countryCode = localeConfig["countryCode"];
var languageCode = localeConfig["languageCode"];
var enableFullCalendar = localeConfig["fullCalendar"];
var enableDatePicker = localeConfig["datePicker"];
var enableSelect2 = localeConfig["select2"];
let localeConfig = locales[key];
let locale = localeConfig["locale"];
let languageCode = localeConfig["languageCode"];
let enableFullCalendar = localeConfig["fullCalendar"];
let enableDatePicker = localeConfig["datePicker"];
let enableSelect2 = localeConfig["select2"];

var tempFile = 'locale/JSONKeys/'+locale+'.json';
var poTerms = grunt.file.read(tempFile);
if (poTerms == "") {
let tempFile = 'locale/JSONKeys/'+locale+'.json';
let poTerms = grunt.file.read(tempFile);
if (poTerms === "") {
poTerms = "{}";
}
var jsFileContent = '// Source: ' + tempFile;
jsFileContent = jsFileContent + "\ntry {window.CRM.i18keys = " + poTerms + ";} catch(e) {};\n";
let jsFileContent = '// Source POEditor: ' + tempFile;
jsFileContent = jsFileContent + "\ntry {window.CRM.i18keys = " + poTerms + ";} catch(e) {}\n";

if (enableFullCalendar) {
var tempLangCode = languageCode.toLowerCase();
let tempLangCode = languageCode.toLowerCase();
if (localeConfig.hasOwnProperty("fullCalendarLocale")) {
tempLangCode = localeConfig["fullCalendarLocale"];
}
tempFile = 'node_modules/@fullcalendar/core/locales/'+tempLangCode+'.js';
var fullCalendar = grunt.file.read(tempFile);
jsFileContent = jsFileContent + '\n// Source: ' + tempFile;
jsFileContent = jsFileContent + '\n' + "try {"+fullCalendar+"} catch(e) {};\n";
let fullCalendar = grunt.file.read(tempFile);
jsFileContent = jsFileContent + '\n// Source fullcalendar: ' + tempFile;
jsFileContent = jsFileContent + '\n' + "try {"+fullCalendar+"} catch(e) {}\n";
}
if (enableDatePicker) {
tempFile = 'node_modules/bootstrap-datepicker/dist/locales/bootstrap-datepicker.'+languageCode+'.min.js';
var datePicker = grunt.file.read(tempFile);
jsFileContent = jsFileContent + '\n// Source: ' + tempFile;
jsFileContent = jsFileContent + '\n' + "try {"+datePicker+"} catch(e) {};\n"
let datePicker = grunt.file.read(tempFile);
jsFileContent = jsFileContent + '\n// Source datepicker: ' + tempFile;
jsFileContent = jsFileContent + '\n' + "try {"+datePicker+"} catch(e) {}\n"
}
if (enableSelect2) {
tempFile = 'node_modules/select2/dist/js/i18n/'+languageCode+'.js';
jsFileContent = jsFileContent + '\n// Source: ' + tempFile;
var select2 = grunt.file.read(tempFile);
jsFileContent = jsFileContent + '\n// Source select2: ' + tempFile;
let select2 = grunt.file.read(tempFile);
jsFileContent = jsFileContent + '\n' + "try {"+select2+"} catch(e) {}"
}
grunt.file.write('src/locale/js/'+locale+'.js', jsFileContent );
Expand Down
3 changes: 1 addition & 2 deletions src/Include/Footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,13 @@
<script src="<?= SystemURLs::getRootPath() ?>/skin/external/fastclick/fastclick.js"></script>
<script src="<?= SystemURLs::getRootPath() ?>/skin/external/bootstrap-toggle/bootstrap-toggle.js"></script>
<script src="<?= SystemURLs::getRootPath() ?>/skin/external/i18next/i18next.min.js"></script>
<script src="<?= SystemURLs::getRootPath() ?>/locale/js/<?= Bootstrapper::getCurrentLocale()->getLocale() ?>.js"></script>
<script src="<?= SystemURLs::getRootPath() ?>/skin/external/bootstrap-validator/validator.min.js"></script>

<script src="<?= SystemURLs::getRootPath() ?>/skin/js/IssueReporter.js"></script>
<script src="<?= SystemURLs::getRootPath() ?>/skin/js/DataTables.js"></script>
<script src="<?= SystemURLs::getRootPath() ?>/skin/js/Events.js"></script>
<script src="<?= SystemURLs::getRootPath() ?>/skin/js/Footer.js"></script>

<script src="<?= SystemURLs::getRootPath() ?>/locale/js/<?= Bootstrapper::getCurrentLocale()->getLocale() ?>.js"></script>
<?php if (isset($sGlobalMessage)) {
?>
<script nonce="<?= SystemURLs::getCSPNonce() ?>">
Expand Down
Loading