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

Library menu: change "Engine DJ Prime" to "Engine DJ" #14248

Open
wants to merge 1 commit into
base: 2.5
Choose a base branch
from
Open

Library menu: change "Engine DJ Prime" to "Engine DJ" #14248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/library/export/dlglibraryexport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ DlgLibraryExport::DlgLibraryExport(
pLayout->addLayout(pButtonBarLayout, 3, 0, 1, 2);

setLayout(pLayout);
setWindowTitle(tr("Export Library to Engine Prime"));
//: "Engine DJ" must not be translated
setWindowTitle(tr("Export Library to Engine DJ"));

show();
raise();
Expand Down
2 changes: 1 addition & 1 deletion src/library/export/dlglibraryexport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class DlgLibraryExport : public QDialog {

signals:
/// The startEnginePrimeExport signal is emitted when sufficient information
/// has been gathered from the user to kick off an Engine Prime export, and
/// has been gathered from the user to kick off an Engine DJ export, and
/// details of the request are provided as part of the signal.
void startEnginePrimeExport(QSharedPointer<mixxx::EnginePrimeExportRequest>);

Expand Down
4 changes: 2 additions & 2 deletions src/library/export/engineprimeexportjob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void exportMetadata(
int hotCueIndex = pCue->getHotCue(); // Note: Mixxx uses 0-based.
if (hotCueIndex < 0 || hotCueIndex >= kMaxHotCues) {
qInfo() << "Skipping hot cue" << hotCueIndex
<< "as the Engine Prime format only supports at most"
<< "as the Engine DJ format only supports at most"
<< kMaxHotCues << "hot cues.";
continue;
}
Expand Down Expand Up @@ -652,7 +652,7 @@ void EnginePrimeExportJob::run() {
emit jobProgress(currProgress);
}

qInfo() << "Engine Prime Export Job completed successfully";
qInfo() << "Engine DJ Export Job completed successfully";
emit completed(m_trackRefs.size(), m_crateIds.size());
}

Expand Down
4 changes: 2 additions & 2 deletions src/library/export/engineprimeexportjob.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ namespace mixxx {

struct EnginePrimeExportRequest;

/// The Engine Prime export job performs the work of exporting the Mixxx
/// library to an external Engine Prime (also known as "Engine Library")
/// The Engine DJ export job performs the work of exporting the Mixxx
/// library to an external Engine DJ (also known as "Engine Library")
/// database, using the libdjinterop library, in accordance with the export
/// request with which it is constructed.
class EnginePrimeExportJob : public QThread {
Expand Down
4 changes: 2 additions & 2 deletions src/widget/wmainmenubar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ void WMainMenuBar::initialize() {
pLibraryMenu->addAction(pLibraryRescan);

#ifdef __ENGINEPRIME__
QString exportTitle = tr("E&xport Library to Engine Prime");
QString exportText = tr("Export the library to the Engine Prime format");
QString exportTitle = tr("E&xport Library to Engine DJ");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the & expected there?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

& marks the letter that is used for the mnemonic / keyboard shortcut.
It's been there before, so why remove it?

Though we may add a translator hint for those, too.
Will do that once I clean up this branch in the next days.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Na, I think I won't. let's add that when we notice issues with that (and we haven't seen any until now AFAIR)

QString exportText = tr("Export the library to the Engine DJ format");
Comment on lines +159 to +160
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a comment for translators that 'Engine DJ' is a brand / name and should not be translated.
The syntax is //: hint text and that goes one the line above the tr strings, so here it'd be
//: "Engine DJ" must not be translated

auto* pLibraryExport = new QAction(exportTitle, this);
pLibraryExport->setStatusTip(exportText);
pLibraryExport->setWhatsThis(buildWhatsThis(exportTitle, exportText));
Expand Down