projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More build fixes.
[dcpomatic.git]
/
src
/
lib
/
util.cc
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index da45919b426df35dd6c7943673267d5307f25ae1..d20fd7dc7b0f4d94cb830dfaf6db4d07683d446d 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-36,7
+36,9
@@
#include "digester.h"
#include "audio_processor.h"
#include "compose.hpp"
#include "digester.h"
#include "audio_processor.h"
#include "compose.hpp"
+#include <dcp/locale_convert.h>
#include <dcp/util.h>
#include <dcp/util.h>
+#include <dcp/raw_convert.h>
#include <dcp/picture_asset.h>
#include <dcp/sound_asset.h>
#include <dcp/subtitle_asset.h>
#include <dcp/picture_asset.h>
#include <dcp/sound_asset.h>
#include <dcp/subtitle_asset.h>
@@
-92,6
+94,7
@@
using boost::lexical_cast;
using boost::bad_lexical_cast;
using dcp::Size;
using dcp::raw_convert;
using boost::bad_lexical_cast;
using dcp::Size;
using dcp::raw_convert;
+using dcp::locale_convert;
/** Path to our executable, required by the stacktrace stuff and filled
* in during App::onInit().
/** Path to our executable, required by the stacktrace stuff and filled
* in during App::onInit().
@@
-140,10
+143,10
@@
seconds_to_approximate_hms (int s)
if (hours) {
if (m > 30 && !minutes) {
/// TRANSLATORS: h here is an abbreviation for hours
if (hours) {
if (m > 30 && !minutes) {
/// TRANSLATORS: h here is an abbreviation for hours
- ap +=
raw
_convert<string>(h + 1) + _("h");
+ ap +=
locale
_convert<string>(h + 1) + _("h");
} else {
/// TRANSLATORS: h here is an abbreviation for hours
} else {
/// TRANSLATORS: h here is an abbreviation for hours
- ap +=
raw
_convert<string>(h) + _("h");
+ ap +=
locale
_convert<string>(h) + _("h");
}
if (minutes || seconds) {
}
if (minutes || seconds) {
@@
-155,10
+158,10
@@
seconds_to_approximate_hms (int s)
/* Minutes */
if (s > 30 && !seconds) {
/// TRANSLATORS: m here is an abbreviation for minutes
/* Minutes */
if (s > 30 && !seconds) {
/// TRANSLATORS: m here is an abbreviation for minutes
- ap +=
raw
_convert<string>(m + 1) + _("m");
+ ap +=
locale
_convert<string>(m + 1) + _("m");
} else {
/// TRANSLATORS: m here is an abbreviation for minutes
} else {
/// TRANSLATORS: m here is an abbreviation for minutes
- ap +=
raw
_convert<string>(m) + _("m");
+ ap +=
locale
_convert<string>(m) + _("m");
}
if (seconds) {
}
if (seconds) {
@@
-169,7
+172,7
@@
seconds_to_approximate_hms (int s)
if (seconds) {
/* Seconds */
/// TRANSLATORS: s here is an abbreviation for seconds
if (seconds) {
/* Seconds */
/// TRANSLATORS: s here is an abbreviation for seconds
- ap +=
raw
_convert<string>(s) + _("s");
+ ap +=
locale
_convert<string>(s) + _("s");
}
return ap;
}
return ap;