Bug 1330538 - Rename 'Easing:' to 'Overall easing:'; r?pbro
MozReview-Commit-ID: 2u5K7zbqAPK
--- a/devtools/client/animationinspector/components/animation-time-block.js
+++ b/devtools/client/animationinspector/components/animation-time-block.js
@@ -296,17 +296,17 @@ AnimationTimeBlock.prototype = {
text += L10N.getFormatStr("player.animationIterationStartLabel",
state.iterationStart,
L10N.numberWithDecimals(iterationStartTime, 2));
text += "\n";
}
// Adding the easing if it is not "linear".
if (state.easing && state.easing !== "linear") {
- text += L10N.getStr("player.animationEasingLabel") + " ";
+ text += L10N.getStr("player.animationOverallEasingLabel") + " ";
text += state.easing;
text += "\n";
}
// Adding the fill mode.
if (state.fill) {
text += L10N.getStr("player.animationFillLabel") + " ";
text += state.fill;
--- a/devtools/client/animationinspector/test/browser_animation_timeline_shows_time_info.js
+++ b/devtools/client/animationinspector/test/browser_animation_timeline_shows_time_info.js
@@ -33,19 +33,19 @@ add_task(function* () {
ok(title.match(/End delay: [\d.-]+s/), "The tooltip shows the endDelay");
}
if (state.iterationCount !== 1) {
ok(title.match(/Repeats: /), "The tooltip shows the iterations");
} else {
ok(!title.match(/Repeats: /), "The tooltip doesn't show the iterations");
}
if (state.easing && state.easing !== "linear") {
- ok(title.match(/Easing: /), "The tooltip shows the easing");
+ ok(title.match(/Overall easing: /), "The tooltip shows the easing");
} else {
- ok(!title.match(/Easing: /),
+ ok(!title.match(/Overall easing: /),
"The tooltip doesn't show the easing if it is 'linear'");
}
if (state.fill) {
ok(title.match(/Fill: /), "The tooltip shows the fill");
}
if (state.direction) {
if (state.direction === "normal") {
ok(!title.match(/Direction: /),
--- a/devtools/client/locales/en-US/animationinspector.properties
+++ b/devtools/client/locales/en-US/animationinspector.properties
@@ -65,21 +65,22 @@ player.infiniteIterationCountText=∞
# LOCALIZATION NOTE (player.animationIterationStartLabel):
# This string is displayed in a tooltip that appears when hovering over
# animations in the timeline. It is the label displayed before the animation
# iterationStart value.
# %1$S will be replaced by the original iteration start value
# %2$S will be replaced by the actual time of iteration start
player.animationIterationStartLabel=Iteration start: %1$S (%2$Ss)
-# LOCALIZATION NOTE (player.animationEasingLabel):
+# LOCALIZATION NOTE (player.animationOverallEasingLabel):
# This string is displayed in a tooltip that appears when hovering over
-# animations in the timeline. It is the label displayed before the animation
-# easing value.
-player.animationEasingLabel=Easing:
+# animations in the timeline. It is the label displayed before the easing
+# that applies to a whole iteration of an animation as opposed to the
+# easing that applies between animation keyframes.
+player.animationOverallEasingLabel=Overall easing:
# LOCALIZATION NOTE (player.animationFillLabel):
# This string is displayed in a tooltip that appears when hovering over
# animations in the timeline. It is the label displayed before the animation
# fill mode value.
player.animationFillLabel=Fill:
# LOCALIZATION NOTE (player.animationDirectionLabel):