Louis,
Don't fret Louis.
Your English was 100% correct the first time. It's not your fault that there is a double meaning for the term "happy ending". Originally it was indeed meant to denote the ending of a motion picture on a positive note. Then at some point it also became a way to refer to certain types of massages that were not necessarily delivered by a licensed, registered masseuse. And so on and so forth.
I will dwell no longer on this topic. ;-)
Don't fret Louis.
Your English was 100% correct the first time. It's not your fault that there is a double meaning for the term "happy ending". Originally it was indeed meant to denote the ending of a motion picture on a positive note. Then at some point it also became a way to refer to certain types of massages that were not necessarily delivered by a licensed, registered masseuse. And so on and so forth.
I will dwell no longer on this topic. ;-)