Feature/i18n #515
Feature/i18n #515
Conversation
Conflicts: client/layouts/master_layout/sidebar.html
| @@ -3,52 +3,52 @@ | |||
| <aside class="main-sidebar"> | |||
| <section class="sidebar"> | |||
| <ul class="sidebar-menu"> | |||
| <li class="header">Menu</li> | |||
| <li class="header">{{_ "sidebarMenu"}}</li> | |||
There was a problem hiding this comment.
Consider renaming these to include "masterLayout". E.g. "masterLayout-sidebarMenu", "masterLayout-sidebarAnalytics", ... or "masterLayout.sidebarAnalytics", "masterLayout.sidebarMenu"
Dots or dashes, whichever.
| <p> | ||
| We could not find the page you were looking for.<br> | ||
| Meanwhile, you may <a href="javascript:void(0)" onClick="history.go(-1); return false;">return to a previous page</a>. | ||
| {{_ "notFoundMessagePart1"}}<br> |
There was a problem hiding this comment.
Separate each segment by dot or dash.. E.g. "notFound.message.part1" or "notFound-message-part1"
| <div class="error-content"> | ||
| <p> | ||
| <i class="fa fa-warning text-yellow"></i> | ||
| You are not authorized to access this page. Please ensure you are logged in. | ||
| {{_ "notAuthorizedMessage"}} |
There was a problem hiding this comment.
Separate "notAuthorized" and "message" by a dash (-). "notAuthorized-message".
|
I added the WIP label, as there are still changes to be made with hyphenation of i18n IDs. |
|
Also, be sure to resolve conflicts with |
|
Ready to be merged. |
|
@mauriciovieira or @frenchbread Can you please review the PR? |
|
@bajiat I am currently reviewing #514, so if @mauriciovieira don't ming taking this, would be cool. |
|
@bajiat, @frenchbread I will review this one. |
|
Thanks! |
|
@elnzv Is there a strong reason for not using _, instead of -, like masterLayout_sidebar_Menu ? I tested here with ':' and '.' separators but it does not work, but _ works. Anyways, it seems to be just a matter of style. I think everything here is fine. |
Closes #481