Skip to content

Commit

Permalink
Merge pull request BloomBooks#548 from JohnThomson/nextBloom6_0
Browse files Browse the repository at this point in the history
Changes since download-for-edit version of Desktop is now 6.0 (BL-13349)
  • Loading branch information
hatton authored Apr 26, 2024
2 parents e5462b3 + 6952f6b commit 65512e5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/components/BookDetail/ArtifactHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ function getBookOrderUrl(book: Book, forEdit: boolean) {
// The earliest version that we plan to check this for is 5.5, so it doesn't really
// matter what version we put earlier than that for normal downloads, which are handled
// by all the versions that do this check.
// We do need 5.7 to handle the forEdit parameter, so we will pass that and retrofit at least
// We do need 6.0 to handle the forEdit parameter, so we will pass that and retrofit at least
// 5.5 and 5.6 to do the check.
const minVersion = forEdit ? 5.7 : 4.8;
const minVersion = forEdit ? 6.0 : 4.8;

const forEditPart = forEdit
? `&forEdit=true&database-id=${book.id}`
Expand Down
6 changes: 3 additions & 3 deletions src/components/BookDetail/BookOwnerControlsBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import {
useGetPermissions,
} from "../../connection/LibraryQueryHooks";

// This should become true or just be removed once 5.7 is shipping.
// The controls it hides require 5.7, so we don't want ordinary users to see them until then.
// This should become true or just be removed once 6.0 is shipping.
// The controls it hides require 6.0, so we don't want ordinary users to see them until then.
// We do want to be able to test this on our dev and alpha sites, though.
const allowDownloadForEditing =
window.location.hostname.startsWith("alpha") ||
Expand Down Expand Up @@ -203,7 +203,7 @@ export const BookOwnerControlsBox: React.FunctionComponent<{
<FormattedMessage
id={"book.detail.getForEditBookNotice"}
defaultMessage={
"If necessary, we can give you the book to edit in Bloom. You must first have Bloom 5.7 or greater installed ({downloadLink})."
"If necessary, we can give you the book to edit in Bloom. You must first have Bloom 6.0 or greater installed ({downloadLink})."
}
values={{
downloadLink: (
Expand Down
2 changes: 1 addition & 1 deletion src/localization/Code Strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
"description": ""
},
"book.detail.getForEditBookNotice": {
"message": "If necessary, we can give you the book to edit in Bloom. You must first have Bloom 5.7 or greater installed ({downloadLink}).",
"message": "If necessary, we can give you the book to edit in Bloom. You must first have Bloom 6.0 or greater installed ({downloadLink}).",
"description": "{downloadLink} is a link to the Bloom download page. Leave it exactly as it is except for putting it in the right place; don't translate it here."
},
"book.detail.downloadLink": {
Expand Down

0 comments on commit 65512e5

Please sign in to comment.