Would be good to fix the indentation to not make so much noise when addressing the locale comment.  Not sure how everyone feels about it but I personally prefer the previous indentation where it is indented more after a private or protected call.  It also will help keep the git history less messy in terms of dealing with possible git conflicts to not mess with the indentation.