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.

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

Update cockpit.js file to version 309 #1038

Merged
merged 2 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions web/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ bots:
# when you start a new project, use the latest release, and update it from time to time
test/common:
flock Makefile sh -ec '\
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 307; \
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 309; \
git checkout --force FETCH_HEAD -- test/common; \
git reset test/common'

# checkout Cockpit's PF/React/build library; again this has no API stability guarantee, so check out a stable tag
# TODO: replace the commit with the tag 307 once it is released, which includes cockpit.js as a ES6 module in lib/.
# TODO: replace the commit with the tag 309 once it is released, which includes cockpit.js as a ES6 module in lib/.
$(LIB_TEST):
flock Makefile sh -ec '\
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 307; \
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 309; \
git checkout --force FETCH_HEAD -- ../pkg/lib; \
git reset -- ../pkg/lib'
mv ../pkg/lib src/ && rmdir ../pkg
Expand Down
9 changes: 7 additions & 2 deletions web/package/cockpit-agama.changes
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
-------------------------------------------------------------------
Mon Feb 12 11:53:29 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>

- Update cockpit.js to version 309 (gh#openSUSE/agama#1038).

-------------------------------------------------------------------
Mon Jan 29 14:34:37 UTC 2024 - Knut Anderssen <[email protected]>

- Partly replacing the NetworkManager client by the agama one
- Partly replacing the NetworkManager client by the Agama one
(gh#openSUSE/agama#1006).

-------------------------------------------------------------------
Fri Jan 19 09:34:26 UTC 2024 - Nagu <[email protected]>

- Storage UI: show mount point selector only when the user can change it.
(gh#openSUSE/agama#1007)

-------------------------------------------------------------------
Thu Jan 18 08:33:52 UTC 2024 - Ancor Gonzalez Sosa <[email protected]>

Expand Down
7 changes: 6 additions & 1 deletion web/src/lib/cockpit.js
Original file line number Diff line number Diff line change
Expand Up @@ -3709,6 +3709,7 @@ function factory() {

cockpit.language = "en";
cockpit.language_direction = "ltr";
const test_l10n = window.localStorage.test_l10n;

cockpit.locale = function locale(po) {
let lang = cockpit.language;
Expand Down Expand Up @@ -3796,8 +3797,12 @@ function factory() {
if (po_data) {
const translated = po_data[key];
if (translated?.[1])
return translated[1];
string = translated[1];
}

if (test_l10n === 'true')
return "»" + string + "«";

return string;
};

Expand Down
Loading