[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric.carlson at apple.com
eric.carlson at apple.com
Wed Apr 7 23:18:43 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit c8c0bd5c38251bcb72f5551807a09be691898783
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 2 22:03:38 2009 +0000
2009-11-02 Eric Carlson <eric.carlson at apple.com>
Reviewed by John Sullivan and Mark Rowe.
<rdar://problem/7356733> Voiceover does not read correct media controller time values
Fix localized strings for media controller time values.
* English.lproj/Localizable.strings:
2009-11-02 Eric Carlson <eric.carlson at apple.com>
Reviewed by John Sullivan and Mark Rowe.
<rdar://problem/7356733> Voiceover does not read correct media controller time values
* WebCoreSupport/WebViewFactory.mm:
(-[WebViewFactory localizedMediaTimeDescription:]):
2009-11-02 Eric Carlson <eric.carlson at apple.com>
Reviewed by John Sullivan and Mark Rowe.
<rdar://problem/7356733> Voiceover does not read correct media controller time values
* WebCoreLocalizedStrings.cpp:
(WebCore::localizedMediaTimeDescription):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50429 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e39f2dd..26efc6b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-02 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by John Sullivan and Mark Rowe.
+
+ <rdar://problem/7356733> Voiceover does not read correct media controller time values
+
+ Fix localized strings for media controller time values.
+
+ * English.lproj/Localizable.strings:
+
2009-11-02 Chris Fleizach <cfleizach at apple.com>
Reviewed by Beth Dakin.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 3368a33..a20e6ee 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 42bbf85..05e9c50 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-02 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by John Sullivan and Mark Rowe.
+
+ <rdar://problem/7356733> Voiceover does not read correct media controller time values
+
+ * WebCoreSupport/WebViewFactory.mm:
+ (-[WebViewFactory localizedMediaTimeDescription:]):
+
2009-11-02 Dan Bernstein <mitz at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebKit/mac/WebCoreSupport/WebViewFactory.mm b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
index 263ea03..53df7fe 100644
--- a/WebKit/mac/WebCoreSupport/WebViewFactory.mm
+++ b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
@@ -732,7 +732,7 @@
- (NSString*)localizedMediaTimeDescription:(float)time
{
if (!isfinite(time))
- return UI_STRING("indefinite time", "string for an indefinite movie time");
+ return UI_STRING("indefinite time", "accessibility help text for an indefinite media controller time value");
int seconds = (int)fabsf(time);
int days = seconds / (60 * 60 * 24);
@@ -741,13 +741,13 @@
seconds %= 60;
if (days)
- return [NSString stringWithFormat:UI_STRING("date.format.for.days", "string for days, hours, minutes & seconds"), days, hours, minutes, seconds];
+ return [NSString stringWithFormat:UI_STRING("%1$d days %2$d hours %3$d minutes %4$d seconds", "accessibility help text for media controller time value >= 1 day"), days, hours, minutes, seconds];
else if (hours)
- return [NSString stringWithFormat:UI_STRING("date.format.for.hours", "string for hours, minutes & seconds"), hours, minutes, seconds];
+ return [NSString stringWithFormat:UI_STRING("%1$d hours %2$d minutes %3$d seconds", "accessibility help text for media controller time value >= 60 minutes"), hours, minutes, seconds];
else if (minutes)
- return [NSString stringWithFormat:UI_STRING("date.format.for.minutes", "string for minutes & seconds"), minutes, seconds];
+ return [NSString stringWithFormat:UI_STRING("%1$d minutes %2$d seconds", "accessibility help text for media controller time value >= 60 seconds"), minutes, seconds];
- return [NSString stringWithFormat:UI_STRING("date.format.for.seconds", "string for seconds"), seconds];
+ return [NSString stringWithFormat:UI_STRING("%1$d seconds", "accessibility help text for media controller time value < 60 seconds"), seconds];
}
@end
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 2b8a0a2..b3c8c95 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-02 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by John Sullivan and Mark Rowe.
+
+ <rdar://problem/7356733> Voiceover does not read correct media controller time values
+
+ * WebCoreLocalizedStrings.cpp:
+ (WebCore::localizedMediaTimeDescription):
+
2009-10-29 Jon Honeycutt <jhoneycutt at apple.com>
MSAA: Accessibility of headings is not correct
diff --git a/WebKit/win/WebCoreLocalizedStrings.cpp b/WebKit/win/WebCoreLocalizedStrings.cpp
index 03d03e7..95dfa76 100644
--- a/WebKit/win/WebCoreLocalizedStrings.cpp
+++ b/WebKit/win/WebCoreLocalizedStrings.cpp
@@ -198,7 +198,7 @@ String WebCore::localizedMediaControlElementHelpText(const String& name)
String WebCore::localizedMediaTimeDescription(float time)
{
if (!isfinite(time))
- return String(LPCTSTR_UI_STRING("indefinite time", "string for an indefinite movie time"));
+ return String(LPCTSTR_UI_STRING("indefinite time", "accessibility help text for an indefinite media controller time value"));
int seconds = (int)fabsf(time);
int days = seconds / (60 * 60 * 24);
@@ -207,24 +207,24 @@ String WebCore::localizedMediaTimeDescription(float time)
seconds %= 60;
if (days) {
- static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("date.format.for.days", "string for days, hours, minutes & seconds"));
+ static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("%1$d days %2$d hours %3$d minutes %4$d seconds", "accessibility help text for media controller time value >= 1 day"));
RetainPtr<CFStringRef> result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), days, hours, minutes, seconds));
return result.get();
}
if (hours) {
- static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("date.format.for.hours", "string for hours, minutes & seconds"));
+ static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("%1$d hours %2$d minutes %3$d seconds", "accessibility help text for media controller time value >= 60 minutes"));
RetainPtr<CFStringRef> result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), hours, minutes, seconds));
return result.get();
}
if (minutes) {
- static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("date.format.for.minutes", "string for minutes & seconds"));
+ static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("%1$d minutes %2$d seconds", "accessibility help text for media controller time value >= 60 seconds"));
RetainPtr<CFStringRef> result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), minutes, seconds));
return result.get();
}
- static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("date.format.for.seconds", "string for seconds"));
+ static RetainPtr<CFStringRef> format(AdoptCF, UI_STRING("%1$d seconds", "accessibility help text for media controller time value < 60 seconds"));
RetainPtr<CFStringRef> result(AdoptCF, CFStringCreateWithFormat(0, 0, format.get(), seconds));
return result.get();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list